diff --git a/app-ui-settings/src/main/java/me/proton/drive/android/settings/domain/usecase/ToggleLayoutType.kt b/app-ui-settings/src/main/java/me/proton/drive/android/settings/domain/usecase/ToggleLayoutType.kt
index ce6ed66f..55f167d1 100644
--- a/app-ui-settings/src/main/java/me/proton/drive/android/settings/domain/usecase/ToggleLayoutType.kt
+++ b/app-ui-settings/src/main/java/me/proton/drive/android/settings/domain/usecase/ToggleLayoutType.kt
@@ -19,13 +19,14 @@
 package me.proton.drive.android.settings.domain.usecase
 
 import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.drive.android.settings.domain.entity.LayoutType
 import javax.inject.Inject
 
 class ToggleLayoutType @Inject constructor(
     private val updateLayoutType: UpdateLayoutType
 ) {
-    suspend operator fun invoke(userId: UserId, currentLayoutType: LayoutType) =
+    suspend operator fun invoke(userId: UserId, currentLayoutType: LayoutType) = coRunCatching {
         updateLayoutType(
             userId = userId,
             layoutType = if (currentLayoutType == LayoutType.GRID) {
@@ -33,5 +34,6 @@ class ToggleLayoutType @Inject constructor(
             } else {
                 LayoutType.GRID
             }
-        )
+        ).getOrThrow()
+    }
 }
diff --git a/app-ui-settings/src/main/java/me/proton/drive/android/settings/domain/usecase/UpdateLayoutType.kt b/app-ui-settings/src/main/java/me/proton/drive/android/settings/domain/usecase/UpdateLayoutType.kt
index 6edadbf9..8ea8f3d0 100644
--- a/app-ui-settings/src/main/java/me/proton/drive/android/settings/domain/usecase/UpdateLayoutType.kt
+++ b/app-ui-settings/src/main/java/me/proton/drive/android/settings/domain/usecase/UpdateLayoutType.kt
@@ -19,6 +19,7 @@
 package me.proton.drive.android.settings.domain.usecase
 
 import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.drive.android.settings.domain.UiSettingsRepository
 import me.proton.drive.android.settings.domain.entity.LayoutType
 import javax.inject.Inject
@@ -26,6 +27,7 @@ import javax.inject.Inject
 class UpdateLayoutType @Inject constructor(
     private val repository: UiSettingsRepository
 ) {
-    suspend operator fun invoke(userId: UserId, layoutType: LayoutType) =
+    suspend operator fun invoke(userId: UserId, layoutType: LayoutType) = coRunCatching {
         repository.updateLayoutType(userId, layoutType)
+    }
 }
diff --git a/app-ui-settings/src/main/java/me/proton/drive/android/settings/domain/usecase/UpdateThemeStyle.kt b/app-ui-settings/src/main/java/me/proton/drive/android/settings/domain/usecase/UpdateThemeStyle.kt
index 8ed1aebe..eb3999ab 100644
--- a/app-ui-settings/src/main/java/me/proton/drive/android/settings/domain/usecase/UpdateThemeStyle.kt
+++ b/app-ui-settings/src/main/java/me/proton/drive/android/settings/domain/usecase/UpdateThemeStyle.kt
@@ -19,6 +19,7 @@
 package me.proton.drive.android.settings.domain.usecase
 
 import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.drive.android.settings.domain.UiSettingsRepository
 import me.proton.drive.android.settings.domain.entity.ThemeStyle
 import javax.inject.Inject
@@ -26,6 +27,7 @@ import javax.inject.Inject
 class UpdateThemeStyle @Inject constructor(
     private val repository: UiSettingsRepository
 ) {
-    suspend operator fun invoke(userId: UserId, themeStyle: ThemeStyle) =
+    suspend operator fun invoke(userId: UserId, themeStyle: ThemeStyle) = coRunCatching {
         repository.updateThemeStyle(userId, themeStyle)
+    }
 }
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9059c98e..ce436457 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -27,7 +27,6 @@ plugins {
     id("dagger.hilt.android.plugin")
     id("kotlin-parcelize")
     kotlin("android")
-    kotlin("kapt")
     id("me.proton.core.gradle-plugins.environment-config") version "1.3.0"
 }
 
@@ -82,8 +81,7 @@ driveModule(
     implementation(libs.treessence)
 
     androidTestImplementation(libs.dagger.hilt.android.testing)
-    kapt(libs.dagger.hilt.android.compiler)
-    kaptAndroidTest(libs.dagger.hilt.android.compiler)
+    add("kspAndroidTest", libs.dagger.hilt.android.compiler)
 
     androidTestUtil(libs.androidx.test.orchestrator)
     androidTestUtil(libs.androidx.test.services)
diff --git a/app/src/main/kotlin/me/proton/android/drive/di/ApplicationModule.kt b/app/src/main/kotlin/me/proton/android/drive/di/ApplicationModule.kt
index a91bbbc2..d0068342 100644
--- a/app/src/main/kotlin/me/proton/android/drive/di/ApplicationModule.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/di/ApplicationModule.kt
@@ -48,6 +48,7 @@ import me.proton.android.drive.provider.AppBuildConfigFieldsProvider
 import me.proton.android.drive.provider.BuildConfigurationProvider
 import me.proton.android.drive.provider.AppProtonDriveClientProvider
 import me.proton.android.drive.provider.AppProtonPhotosClientProvider
+import me.proton.android.drive.provider.AppProtonSdkClientProvider
 import me.proton.android.drive.repository.BridgeFindDuplicatesRepository
 import me.proton.android.drive.repository.ClientUidRepositoryImpl
 import me.proton.android.drive.settings.DebugSettings
@@ -75,6 +76,7 @@ import me.proton.core.drive.base.domain.usecase.DriveUrlBuilder
 import me.proton.core.drive.documentsprovider.domain.usecase.GetDocumentsProviderRoots
 import me.proton.core.drive.folder.create.domain.provider.OpenFolderActionProvider
 import me.proton.core.drive.key.domain.handler.PublicKeyEventHandler
+import me.proton.core.drive.link.domain.provider.ProtonSdkClientProvider
 import me.proton.core.drive.log.domain.handler.LogEventHandler
 import me.proton.core.drive.messagequeue.domain.ActionProvider
 import me.proton.core.drive.notification.data.provider.NotificationBuilderProvider
@@ -250,6 +252,10 @@ abstract class ApplicationBindsModule {
     @Singleton
     abstract fun bindsAppProtonPhotosClientProvider(impl: AppProtonPhotosClientProvider): ProtonPhotosClientProvider
 
+    @Binds
+    @Singleton
+    abstract fun bindsAppProtonSdkClientProvider(impl: AppProtonSdkClientProvider): ProtonSdkClientProvider
+
     @Binds
     @IntoSet
     abstract fun bindsOpenFolderActionProvider(impl: OpenFolderActionProvider): ActionProvider
diff --git a/app/src/main/kotlin/me/proton/android/drive/initializer/DownloadInitializer.kt b/app/src/main/kotlin/me/proton/android/drive/initializer/DownloadInitializer.kt
index 2f1f1ae1..841b8a68 100644
--- a/app/src/main/kotlin/me/proton/android/drive/initializer/DownloadInitializer.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/initializer/DownloadInitializer.kt
@@ -107,7 +107,9 @@ class DownloadInitializer : Initializer<Unit> {
         downloadErrorHandlers.forEach { handler ->
             coRunCatching {
                 handler.onError(downloadError)
-            }.getOrNull(LogTag.DOWNLOAD, "Failed to handle download error")
+            }.onFailure { error ->
+                error.log(LogTag.DOWNLOAD, "Failed to handle download error")
+            }
         }
     }
 
diff --git a/app/src/main/kotlin/me/proton/android/drive/initializer/ProtonDriveSdkInitializer.kt b/app/src/main/kotlin/me/proton/android/drive/initializer/ProtonDriveSdkInitializer.kt
index d8893e90..0c66c420 100644
--- a/app/src/main/kotlin/me/proton/android/drive/initializer/ProtonDriveSdkInitializer.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/initializer/ProtonDriveSdkInitializer.kt
@@ -28,8 +28,7 @@ import dagger.hilt.components.SingletonComponent
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import me.proton.android.drive.provider.AppProtonDriveClientProvider
-import me.proton.android.drive.provider.AppProtonPhotosClientProvider
+import me.proton.android.drive.provider.AppProtonSdkClientProvider
 import me.proton.core.accountmanager.domain.AccountManager
 import me.proton.core.accountmanager.presentation.observe
 import me.proton.core.accountmanager.presentation.onAccountRemoved
@@ -49,8 +48,7 @@ class ProtonDriveSdkInitializer : Initializer<Unit> {
         ).run {
             accountManager.observe(appLifecycleProvider.lifecycle, Lifecycle.State.RESUMED)
                 .onAccountRemoved { account ->
-                    appProtonDriveClientProvider.remove(account.userId)
-                    appProtonPhotosClientProvider.remove(account.userId)
+                    appProtonSdkClientProvider.remove(account.userId)
                 }
         }
     }
@@ -66,6 +64,5 @@ interface SdkInitializerEntryPoint {
     val configurationProvider: ConfigurationProvider
     val accountManager: AccountManager
     val appLifecycleProvider: AppLifecycleProvider
-    val appProtonDriveClientProvider: AppProtonDriveClientProvider
-    val appProtonPhotosClientProvider: AppProtonPhotosClientProvider
+    val appProtonSdkClientProvider: AppProtonSdkClientProvider
 }
diff --git a/app/src/main/kotlin/me/proton/android/drive/initializer/ShortcutInitializer.kt b/app/src/main/kotlin/me/proton/android/drive/initializer/ShortcutInitializer.kt
index c027a8e9..f9250280 100644
--- a/app/src/main/kotlin/me/proton/android/drive/initializer/ShortcutInitializer.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/initializer/ShortcutInitializer.kt
@@ -65,6 +65,12 @@ class ShortcutInitializer : Initializer<Unit> {
                 }
                 .onAccountRemoved {
                     updateDynamicShortcuts(emptyList())
+                        .onFailure { error ->
+                            error.log(
+                                tag = LogTag.DEFAULT,
+                                message = "Failed to clear dynamic shortcuts",
+                            )
+                        }
                 }
         }
     }
diff --git a/app/src/main/kotlin/me/proton/android/drive/initializer/TagsMigrationInitializer.kt b/app/src/main/kotlin/me/proton/android/drive/initializer/TagsMigrationInitializer.kt
index 764a14e0..e8b52a86 100644
--- a/app/src/main/kotlin/me/proton/android/drive/initializer/TagsMigrationInitializer.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/initializer/TagsMigrationInitializer.kt
@@ -133,7 +133,7 @@ class TagsMigrationInitializer : Initializer<Unit> {
                                     driveLink = getDriveLink(fileId).toResult().getOrThrow(),
                                     retryable = true,
                                     networkType = NetworkType.UNMETERED,
-                                )
+                                ).getOrThrow()
                             }.onFailure { error ->
                                 error.log(
                                     PHOTO,
diff --git a/app/src/main/kotlin/me/proton/android/drive/initializer/WebViewInitializer.kt b/app/src/main/kotlin/me/proton/android/drive/initializer/WebViewInitializer.kt
index fa81e0da..fc648e84 100644
--- a/app/src/main/kotlin/me/proton/android/drive/initializer/WebViewInitializer.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/initializer/WebViewInitializer.kt
@@ -29,6 +29,7 @@ import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.components.SingletonComponent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.core.drive.base.domain.extension.getOrNull
 import me.proton.core.drive.base.domain.log.LogTag
 import me.proton.core.presentation.app.AppLifecycleProvider
@@ -51,7 +52,9 @@ class WebViewInitializer : Initializer<Unit> {
                             CoreLogger.d(LogTag.WEBVIEW, "Start safe browsing: $isSuccess")
                         }
                     }
-                }.getOrNull(LogTag.WEBVIEW, "startSafeBrowsing failed")
+                }.onFailure { error ->
+                    error.log(LogTag.WEBVIEW, "startSafeBrowsing failed")
+                }
             }
         }
     }
diff --git a/app/src/main/kotlin/me/proton/android/drive/notification/AppNotificationBuilderProvider.kt b/app/src/main/kotlin/me/proton/android/drive/notification/AppNotificationBuilderProvider.kt
index 8f2e7578..40cbc93a 100644
--- a/app/src/main/kotlin/me/proton/android/drive/notification/AppNotificationBuilderProvider.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/notification/AppNotificationBuilderProvider.kt
@@ -21,6 +21,7 @@ package me.proton.android.drive.notification
 import androidx.core.app.NotificationCompat
 import me.proton.android.drive.usecase.notification.BackupNotificationBuilder
 import me.proton.android.drive.usecase.notification.DownloadNotificationBuilder
+import me.proton.android.drive.usecase.notification.DownloadFileProgressNotificationBuilder
 import me.proton.android.drive.usecase.notification.ForcedSignOutNotificationBuilder
 import me.proton.android.drive.usecase.notification.NoSpaceLeftOnDeviceNotificationBuilder
 import me.proton.android.drive.usecase.notification.StorageFullNotificationBuilder
@@ -35,6 +36,7 @@ class AppNotificationBuilderProvider @Inject constructor(
     private val storageFullBuilder: StorageFullNotificationBuilder,
     private val uploadNotificationBuilder: UploadNotificationBuilder,
     private val downloadNotificationBuilder: DownloadNotificationBuilder,
+    private val downloadFileProgressNotificationBuilder: DownloadFileProgressNotificationBuilder,
     private val forcedSignOutNotificationBuilder: ForcedSignOutNotificationBuilder,
     private val noSpaceLeftOnDeviceNotificationBuilder: NoSpaceLeftOnDeviceNotificationBuilder,
     private val backupNotificationBuilder: BackupNotificationBuilder,
@@ -55,10 +57,15 @@ class AppNotificationBuilderProvider @Inject constructor(
                 notificationId = requireIsInstance(notificationId),
                 events = events as List<Event.Upload>,
             )
-        events.size == 1 && events.first() is Event.Download ->
+        events.isNotEmpty() && events.all { it is Event.Download } ->
             downloadNotificationBuilder(
                 notificationId = requireIsInstance(notificationId),
-                event = events.first() as Event.Download,
+                events = events as List<Event.Download>,
+            )
+        events.isNotEmpty() && events.all { it is Event.DownloadFileProgress } ->
+            downloadFileProgressNotificationBuilder(
+                notificationId = requireIsInstance(notificationId),
+                events = events as List<Event.DownloadFileProgress>,
             )
         events.size == 1 && events.first() is Event.ForcedSignOut ->
             forcedSignOutNotificationBuilder(
diff --git a/app/src/main/kotlin/me/proton/android/drive/provider/AppProtonSdkClientProvider.kt b/app/src/main/kotlin/me/proton/android/drive/provider/AppProtonSdkClientProvider.kt
new file mode 100644
index 00000000..4d90620b
--- /dev/null
+++ b/app/src/main/kotlin/me/proton/android/drive/provider/AppProtonSdkClientProvider.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Drive.
+ *
+ * Proton Drive is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Drive is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Drive.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.android.drive.provider
+
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.domain.extension.toResult
+import me.proton.core.drive.base.domain.util.coRunCatching
+import me.proton.core.drive.drivelink.domain.usecase.GetVolumeType
+import me.proton.core.drive.link.domain.entity.LinkId
+import me.proton.core.drive.link.domain.extension.userId
+import me.proton.core.drive.link.domain.provider.ProtonSdkClientProvider
+import me.proton.core.drive.volume.domain.entity.Volume
+import me.proton.core.drive.volume.domain.entity.VolumeId
+import me.proton.core.drive.volume.domain.usecase.GetVolume
+import me.proton.drive.sdk.ProtonSdkClient
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AppProtonSdkClientProvider @Inject constructor(
+    private val getVolumeType: GetVolumeType,
+    private val getVolume: GetVolume,
+    private val driveClientProvider: AppProtonDriveClientProvider,
+    private val photosClientProvider: AppProtonPhotosClientProvider,
+) : ProtonSdkClientProvider {
+
+    override suspend fun getOrCreate(
+        linkId: LinkId,
+    ): Result<ProtonSdkClient> = coRunCatching {
+        getOrCreate(
+            userId = linkId.userId,
+            volumeType = getVolumeType(linkId).getOrThrow(),
+        ).getOrThrow()
+    }
+
+    override suspend fun getOrCreate(
+        userId: UserId,
+        volumeId: VolumeId
+    ): Result<ProtonSdkClient> = coRunCatching {
+        getOrCreate(
+            userId = userId,
+            volumeType = getVolume(userId, volumeId).toResult().getOrThrow().type,
+        ).getOrThrow()
+    }
+
+    override suspend fun getOrCreate(
+        userId: UserId,
+        volumeType: Volume.Type?,
+    ): Result<ProtonSdkClient> = coRunCatching {
+        when (volumeType) {
+            null -> error("Cannot create sdk client for null volume type")
+            Volume.Type.UNKNOWN -> error("Cannot create sdk client for unknown volume type")
+            Volume.Type.REGULAR -> driveClientProvider.getOrCreate(userId).getOrThrow()
+            Volume.Type.PHOTO -> photosClientProvider.getOrCreate(userId).getOrThrow()
+        }
+    }
+
+    fun remove(userId: UserId) {
+        driveClientProvider.remove(userId)
+        photosClientProvider.remove(userId)
+    }
+
+
+}
diff --git a/app/src/main/kotlin/me/proton/android/drive/receiver/NotificationBroadcastReceiver.kt b/app/src/main/kotlin/me/proton/android/drive/receiver/NotificationBroadcastReceiver.kt
index dfd1966c..6bfb9d71 100644
--- a/app/src/main/kotlin/me/proton/android/drive/receiver/NotificationBroadcastReceiver.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/receiver/NotificationBroadcastReceiver.kt
@@ -47,5 +47,6 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
         private const val BASE_ACTION = "proton.android.intent.action"
         const val ACTION_DELETE = "$BASE_ACTION.DELETE"
         const val ACTION_CANCEL_ALL = "$BASE_ACTION.CANCEL_ALL"
+        const val ACTION_CANCEL_ALL_DOWNLOADS = "$BASE_ACTION.CANCEL_ALL_DOWNLOADS"
     }
 }
diff --git a/app/src/main/kotlin/me/proton/android/drive/settings/DebugSettings.kt b/app/src/main/kotlin/me/proton/android/drive/settings/DebugSettings.kt
index a9c21b0e..57867011 100644
--- a/app/src/main/kotlin/me/proton/android/drive/settings/DebugSettings.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/settings/DebugSettings.kt
@@ -155,6 +155,7 @@ class DebugSettings(
     override val preferSdkForDownload: Boolean = true
     override val preferSdkForThumbnail: Boolean = true
     override val preferSdkForNodeOperation: Boolean = true
+    override val preferSdkForTrash: Boolean = true
 
     fun reset(coroutineScope: CoroutineScope) {
         coroutineScope.launch {
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/options/Option.kt b/app/src/main/kotlin/me/proton/android/drive/ui/options/Option.kt
index 3b1e2516..b04479bd 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/options/Option.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/options/Option.kt
@@ -650,7 +650,7 @@ fun Iterable<Option>.filterPermissions(
         Option.ShareMultiplePhotos -> permissions.isAdmin
         Option.TagPhotoFile -> permissions.isAdmin
         Option.TakeAPhoto -> permissions.canWrite
-        Option.Trash -> permissions.isAdmin
+        Option.Trash -> permissions.canWrite
         Option.UploadFile -> permissions.canWrite
         Option.UploadFolder -> permissions.canWrite
     }
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/AccountSettingsScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/AccountSettingsScreen.kt
index 349b465f..0d21715b 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/AccountSettingsScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/AccountSettingsScreen.kt
@@ -31,6 +31,7 @@ import me.proton.core.compose.theme.ProtonTheme
 import me.proton.core.drive.base.presentation.component.TopAppBar
 import me.proton.core.accountmanager.presentation.R as AccountPresentation
 import me.proton.core.presentation.R as CorePresentation
+import me.proton.core.drive.i18n.R as I18N
 
 
 @Composable
@@ -44,6 +45,7 @@ fun AccountSettingsScreen(
     Column(modifier = modifier.fillMaxSize()) {
         TopAppBar(
             navigationIcon = painterResource(id = CorePresentation.drawable.ic_arrow_back),
+            navigationContentDescription = stringResource(I18N.string.common_back_action),
             onNavigationIcon = navigateBack,
             title = stringResource(AccountPresentation.string.account_settings_header),
             modifier = Modifier.statusBarsPadding()
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/AppAccessScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/AppAccessScreen.kt
index ae1c9741..c217abb9 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/AppAccessScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/AppAccessScreen.kt
@@ -77,6 +77,7 @@ fun AppAccess(
     Column(modifier = modifier) {
         TopAppBar(
             navigationIcon = painterResource(id = CorePresentation.drawable.ic_arrow_back),
+            navigationContentDescription = stringResource(I18N.string.common_back_action),
             onNavigationIcon = navigateBack,
             title = viewState.title,
             modifier = Modifier.statusBarsPadding()
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/ComputersScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/ComputersScreen.kt
index bf2dfc1a..6f57ef72 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/ComputersScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/ComputersScreen.kt
@@ -179,6 +179,7 @@ private fun TopAppBar(
         navigationIcon = if (viewState.navigationIconResId != 0) {
             painterResource(id = viewState.navigationIconResId)
         } else null,
+        navigationContentDescription = viewState.navigationContentDescription,
         notificationDotVisible = viewState.notificationDotVisible,
         onNavigationIcon = viewEvent.onTopAppBarNavigation,
         title = viewState.title,
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/CreateNewAlbumScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/CreateNewAlbumScreen.kt
index 0fd526d4..e0feeed5 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/CreateNewAlbumScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/CreateNewAlbumScreen.kt
@@ -124,6 +124,7 @@ fun TopAppBar(
     val focusManager = LocalFocusManager.current
     TopAppBar(
         navigationIcon = painterResource(id = CorePresentation.drawable.ic_arrow_back),
+        navigationContentDescription = stringResource(I18N.string.common_back_action),
         onNavigationIcon = viewEvent.onBackPressed,
         title = "",
         modifier = modifier.statusBarsPadding(),
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/FileInfoScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/FileInfoScreen.kt
index 544da689..485f4589 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/FileInfoScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/FileInfoScreen.kt
@@ -27,6 +27,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -35,6 +36,7 @@ import me.proton.android.drive.ui.viewstate.FileInfoViewState
 import me.proton.core.compose.theme.ProtonDimens.DefaultSpacing
 import me.proton.core.drive.base.presentation.component.TopAppBar
 import me.proton.core.drive.file.info.presentation.FileInfoContent
+import me.proton.core.drive.i18n.R as I18N
 import me.proton.core.presentation.R as CorePresentation
 
 @ExperimentalCoroutinesApi
@@ -65,6 +67,7 @@ fun FileInfo(
     ) {
         TopAppBar(
             navigationIcon = painterResource(id = CorePresentation.drawable.ic_arrow_back),
+            navigationContentDescription = stringResource(I18N.string.common_back_action),
             onNavigationIcon = navigateBack,
             title = "",
             modifier = Modifier.statusBarsPadding()
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/GetMoreFreeStorageScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/GetMoreFreeStorageScreen.kt
index 658b6d9f..e7af61c1 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/GetMoreFreeStorageScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/GetMoreFreeStorageScreen.kt
@@ -116,6 +116,7 @@ private fun TopAppBar(
 ) {
     TopAppBar(
         navigationIcon = painterResource(id = CorePresentation.drawable.ic_proton_close),
+        navigationContentDescription = stringResource(I18N.string.common_close_action),
         onNavigationIcon = navigateBack,
         title = {},
         modifier = modifier.statusBarsPadding(),
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/LogScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/LogScreen.kt
index 4a008252..9753ef28 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/LogScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/LogScreen.kt
@@ -90,6 +90,7 @@ private fun LogScreen(
         TopAppBar(
             title = title,
             navigationIcon = painterResource(id = CorePresentation.drawable.ic_arrow_back),
+            navigationContentDescription = stringResource(I18N.string.common_back_action),
             onNavigationIcon = navigateBack,
         ) {
             ActionButton(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/MoveToFolder.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/MoveToFolder.kt
index 7729422d..1abb589c 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/MoveToFolder.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/MoveToFolder.kt
@@ -111,6 +111,7 @@ fun MoveToFolder(
         Column {
             TopAppBar(
                 navigationIcon = painterResource(id = viewState.navigationIconResId),
+                navigationContentDescription = viewState.navigationContentDescription,
                 onNavigationIcon = viewEvent.onTopAppBarNavigation,
                 title = { modifier ->
                     Title(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/PhotosAndAlbumsScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/PhotosAndAlbumsScreen.kt
index f0b24e04..4c9aa775 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/PhotosAndAlbumsScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/PhotosAndAlbumsScreen.kt
@@ -195,6 +195,7 @@ fun AlbumsTab(
                 navigationIcon = if (viewState.navigationIconResId != 0) {
                     painterResource(id = viewState.navigationIconResId)
                 } else null,
+                navigationContentDescription = viewState.navigationContentDescription,
                 onNavigationIcon = viewEvent.onTopAppBarNavigation,
                 title = defaultTitle,
                 notificationDotVisible = false,
@@ -269,7 +270,7 @@ fun PhotosTab(
 
     viewModel.HandleHomeEffect(homeScaffoldState)
 
-    val photos = rememberFlowWithLifecycle(flow = viewModel.driveLinks)
+    val photos = rememberFlowWithLifecycle(flow = viewModel.photoItems)
     val listEffect = rememberFlowWithLifecycle(flow = viewModel.listEffect)
 
     LaunchedEffect(viewModel, LocalContext.current) {
@@ -339,6 +340,7 @@ private fun PhotosTab(
                 navigationIcon = if (viewState.navigationIconResId != 0) {
                     painterResource(id = viewState.navigationIconResId)
                 } else null,
+                navigationContentDescription = viewState.navigationContentDescription,
                 onNavigationIcon = viewEvent.onTopAppBarNavigation,
                 title = if (viewState.inMultiselect) {
                     { Title(viewState.title, false) }
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/PhotosBackupScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/PhotosBackupScreen.kt
index 105abf42..f981d692 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/PhotosBackupScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/PhotosBackupScreen.kt
@@ -122,6 +122,7 @@ fun PhotosBackup(
     Column(modifier = modifier) {
         TopAppBar(
             navigationIcon = painterResource(id = CorePresentation.drawable.ic_arrow_back),
+            navigationContentDescription = stringResource(I18N.string.common_back_action),
             onNavigationIcon = navigateBack,
             title = viewState.title,
         )
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/PhotosScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/PhotosScreen.kt
index ee80ccec..6efdc419 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/PhotosScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/PhotosScreen.kt
@@ -98,7 +98,7 @@ fun PhotosScreen(
             lifecycle = lifecycle,
         )
     }
-    val photos = rememberFlowWithLifecycle(flow = viewModel.driveLinks)
+    val photos = rememberFlowWithLifecycle(flow = viewModel.photoItems)
     val listEffect = rememberFlowWithLifecycle(flow = viewModel.listEffect)
 
     LaunchedEffect(viewModel, LocalContext.current) {
@@ -203,6 +203,7 @@ fun TopAppBar(
         navigationIcon = if (viewState.navigationIconResId != 0) {
             painterResource(id = viewState.navigationIconResId)
         } else null,
+        navigationContentDescription = viewState.navigationContentDescription,
         notificationDotVisible = viewState.notificationDotVisible,
         onNavigationIcon = viewEvent.onTopAppBarNavigation,
         title = viewState.title,
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/PickerPhotosScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/PickerPhotosScreen.kt
index eaf329a2..0680c049 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/PickerPhotosScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/PickerPhotosScreen.kt
@@ -184,6 +184,7 @@ fun TopAppBar(
 ) {
     BaseTopAppBar(
         navigationIcon = painterResource(CorePresentation.drawable.ic_proton_close),
+        navigationContentDescription = stringResource(I18N.string.common_close_action),
         onNavigationIcon = onNavigationIcon,
         title = title,
         modifier = modifier.statusBarsPadding(),
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/ScanDocumentNameScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/ScanDocumentNameScreen.kt
index b1f9aaba..2a610e57 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/ScanDocumentNameScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/ScanDocumentNameScreen.kt
@@ -45,6 +45,7 @@ import me.proton.core.compose.theme.ProtonTheme
 import me.proton.core.compose.theme.headlineSmallNorm
 import me.proton.core.compose.theme.interactionNorm
 import me.proton.core.drive.base.presentation.component.TopAppBar
+import me.proton.core.drive.i18n.R as I18N
 import me.proton.core.presentation.R as CorePresentation
 
 @Composable
@@ -101,6 +102,7 @@ fun TopAppBar(
     val focusManager = LocalFocusManager.current
     TopAppBar(
         navigationIcon = painterResource(id = CorePresentation.drawable.ic_proton_cross),
+        navigationContentDescription = stringResource(I18N.string.common_close_action),
         onNavigationIcon = viewEvent.onBackPressed,
         title = stringResource(id = viewState.titleResId),
         modifier = modifier.statusBarsPadding(),
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/SharedTabsScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/SharedTabsScreen.kt
index 46aa5f08..61f2d83c 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/SharedTabsScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/SharedTabsScreen.kt
@@ -73,6 +73,7 @@ fun SharedTabsScreen(
             TopAppBar(
                 titleResId = viewState.titleResId,
                 navigationIconResId = viewState.navigationIconResId,
+                navigationContentDescription = viewState.navigationContentDescription,
                 onTopAppBarNavigation = viewEvent.onTopAppBarNavigation,
             )
         }
@@ -147,11 +148,13 @@ fun SharedTabs(
 private fun TopAppBar(
     @StringRes titleResId: Int,
     @DrawableRes navigationIconResId: Int,
+    navigationContentDescription: String?,
     modifier: Modifier = Modifier,
     onTopAppBarNavigation: () -> Unit,
 ) {
     BaseTopAppBar(
         navigationIcon = painterResource(id = navigationIconResId),
+        navigationContentDescription = navigationContentDescription,
         onNavigationIcon = onTopAppBarNavigation,
         title = stringResource(id = titleResId),
         modifier = modifier,
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/SpringSalePromoScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/SpringSalePromoScreen.kt
index 25a08a48..5642f640 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/SpringSalePromoScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/SpringSalePromoScreen.kt
@@ -306,6 +306,7 @@ private fun TopAppBar(
     if (isLandscape) {
         BaseTopAppBar(
             navigationIcon = painterResource((closeAction as Action.Icon).iconResId),
+            navigationContentDescription = stringResource((closeAction as Action.Icon).contentDescriptionResId),
             onNavigationIcon = closeAction.onAction,
             title = "",
             backgroundColor = backgroundColor,
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/SyncedFoldersScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/SyncedFoldersScreen.kt
index 828ebdcf..4cfe922f 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/SyncedFoldersScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/SyncedFoldersScreen.kt
@@ -114,6 +114,7 @@ private fun TopAppBar(
         navigationIcon = if (viewState.navigationIconResId != 0) {
             painterResource(id = viewState.navigationIconResId)
         } else null,
+        navigationContentDescription = viewState.navigationContentDescription,
         onNavigationIcon = viewEvent.onTopAppBarNavigation,
         title = viewState.title ?: "",
         isTitleEncrypted = viewState.isTitleEncrypted,
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/screen/UploadToScreen.kt b/app/src/main/kotlin/me/proton/android/drive/ui/screen/UploadToScreen.kt
index 38c88592..0c52e954 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/screen/UploadToScreen.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/screen/UploadToScreen.kt
@@ -147,6 +147,7 @@ fun UploadTo(
         Column(modifier = Modifier.fillMaxWidth()) {
             TopAppBar(
                 navigationIcon = painterResource(id = viewState.navigationIconResId),
+                navigationContentDescription = viewState.navigationContentDescription,
                 onNavigationIcon = viewEvent.onTopAppBarNavigation,
                 title = viewState.title,
                 isTitleEncrypted = viewState.isTitleEncrypted,
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AddToAlbumsOptionsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AddToAlbumsOptionsViewModel.kt
index f6c27d54..c95cb003 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AddToAlbumsOptionsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AddToAlbumsOptionsViewModel.kt
@@ -23,11 +23,13 @@ import androidx.lifecycle.SavedStateHandle
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.photos.domain.usecase.AddPhotosToAlbum
 import me.proton.android.drive.photos.domain.usecase.AddToAlbumInfo
 import me.proton.android.drive.ui.viewevent.AddToAlbumsOptionsViewEvent
 import me.proton.android.drive.ui.viewstate.AddToAlbumsOptionsViewState
 import me.proton.core.domain.arch.DataResult
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.component.RunAction
@@ -47,8 +49,8 @@ import me.proton.core.drive.photo.domain.entity.PhotoListing
 import me.proton.core.drive.share.crypto.domain.usecase.GetPhotoShare
 import me.proton.core.drive.share.domain.entity.Share
 import javax.inject.Inject
-import me.proton.core.presentation.R as CorePresentation
 import me.proton.core.drive.i18n.R as I18N
+import me.proton.core.presentation.R as CorePresentation
 
 @HiltViewModel
 class AddToAlbumsOptionsViewModel @Inject constructor(
@@ -123,7 +125,9 @@ class AddToAlbumsOptionsViewModel @Inject constructor(
     }
 
     override suspend fun onSuccessfullyAdded(photoListings: List<PhotoListing.Volume>) {
-        deselectLinks(selectionId)
+        deselectLinks(selectionId).onFailure { error ->
+            error.log(VIEW_MODEL, "Failed to deselect links")
+        }
     }
 
     override fun getAlbumDetails(album: DriveLink.Album?): String? = album.details()
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AlbumOptionsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AlbumOptionsViewModel.kt
index cf642014..47f1cf52 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AlbumOptionsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AlbumOptionsViewModel.kt
@@ -33,6 +33,7 @@ import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transform
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.options.Option
 import me.proton.android.drive.ui.options.filter
 import me.proton.android.drive.ui.options.filterPermissions
@@ -41,6 +42,7 @@ import me.proton.android.drive.ui.options.filterShareMember
 import me.proton.core.domain.arch.mapSuccessValueOrNull
 import me.proton.core.drive.base.domain.entity.Permissions
 import me.proton.core.drive.base.domain.extension.mapWithPrevious
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.presentation.component.RunAction
 import me.proton.core.drive.base.presentation.extension.require
 import me.proton.core.drive.base.presentation.viewmodel.UserViewModel
@@ -115,7 +117,9 @@ class AlbumOptionsViewModel @Inject constructor(
                 when (option) {
                     is Option.OfflineToggle -> option.build(runAction) { driveLink ->
                         viewModelScope.launch {
-                            toggleOffline(driveLink)
+                            toggleOffline(driveLink).onFailure { error ->
+                                error.log(VIEW_MODEL, "Failed to toggle offline for ${driveLink.id.id}")
+                            }
                         }
                     }
                     is Option.ShareViaInvitations -> option.build(runAction, navigateToShareViaInvitations)
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AlbumViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AlbumViewModel.kt
index 7b80539d..9c0aec9a 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AlbumViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AlbumViewModel.kt
@@ -48,6 +48,7 @@ import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.launch
 import me.proton.android.drive.extension.getDefaultMessage
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.extension.thumbnailVO
 import me.proton.android.drive.photos.domain.usecase.AddPhotosToStream
 import me.proton.android.drive.photos.domain.usecase.AddToAlbumInfo
@@ -63,13 +64,12 @@ import me.proton.android.drive.ui.common.onClick
 import me.proton.android.drive.usecase.OnFilesDriveLinkError
 import me.proton.core.domain.arch.mapSuccessValueOrNull
 import me.proton.core.domain.arch.onSuccess
-import me.proton.core.drive.base.data.extension.log
+import me.proton.core.drive.base.data.extension.log as logResult
 import me.proton.core.drive.base.domain.entity.Permissions
 import me.proton.core.drive.base.domain.extension.filterSuccessOrError
 import me.proton.core.drive.base.domain.extension.isViewerOrEditorOnly
 import me.proton.core.drive.base.domain.extension.mapWithPrevious
 import me.proton.core.drive.base.domain.extension.onFailure
-import me.proton.core.drive.base.domain.log.LogTag
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.log.logId
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
@@ -203,7 +203,7 @@ class AlbumViewModel @Inject constructor(
                                 contentState = listContentState,
                                 shareType = Share.Type.PHOTO,
                             )
-                            error.log(VIEW_MODEL)
+                            error.logResult(VIEW_MODEL)
                         }
                     return@mapWithPrevious null
                 }
@@ -260,6 +260,11 @@ class AlbumViewModel @Inject constructor(
             } else {
                 CorePresentation.drawable.ic_proton_close
             },
+            navigationContentDescription = if (selected.isEmpty() || inPickerMode) {
+                appContext.getString(I18N.string.common_back_action)
+            } else {
+                appContext.getString(I18N.string.common_close_action)
+            },
             title = takeIf { selected.isNotEmpty() && !inPickerMode }
                 ?.let {
                     appContext.quantityString(
@@ -412,7 +417,7 @@ class AlbumViewModel @Inject constructor(
         viewModelScope.launch {
             saveAllLoading.value = true
             addPhotosToStream(albumId).onFailure { error ->
-                error.log(LogTag.ALBUM, "Cannot copy photo to stream: ${albumId.id}")
+                error.log(VIEW_MODEL, "Cannot copy photo to stream: ${albumId.id}")
                 broadcastMessages(
                     userId = userId,
                     message = error.getDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AlbumsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AlbumsViewModel.kt
index b92acf55..bf84c337 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AlbumsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AlbumsViewModel.kt
@@ -43,6 +43,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transform
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.photos.domain.usecase.GetPhotosDriveLink
 import me.proton.android.drive.photos.presentation.state.AlbumsItem
 import me.proton.android.drive.photos.presentation.viewevent.AlbumsViewEvent
@@ -56,7 +57,7 @@ import me.proton.core.domain.arch.mapSuccessValueOrNull
 import me.proton.core.domain.arch.onSuccess
 import me.proton.core.drive.base.data.extension.getDefaultMessage
 import me.proton.core.drive.base.data.extension.isRetryable
-import me.proton.core.drive.base.data.extension.log
+import me.proton.core.drive.base.data.extension.log as logResult
 import me.proton.core.drive.base.domain.extension.filterSuccessOrError
 import me.proton.core.drive.base.domain.extension.mapWithPrevious
 import me.proton.core.drive.base.domain.extension.onFailure
@@ -137,6 +138,7 @@ class AlbumsViewModel @Inject constructor(
             isRefreshEnabled = listContentState.value != ListContentState.Loading,
             placeholderImageResId = emptyStateImageResId,
             navigationIconResId = CorePresentation.drawable.ic_proton_hamburger,
+            navigationContentDescription = appContext.getString(I18N.string.common_open_side_menu_action),
             filters = listOf(
                 AlbumsFilter(
                     AlbumListing.Filter.ALL,
@@ -205,7 +207,7 @@ class AlbumsViewModel @Inject constructor(
                                 contentState = listContentState,
                                 shareType = Share.Type.PHOTO,
                             )
-                            error.log(VIEW_MODEL, "Cannot get drive link")
+                            error.logResult(VIEW_MODEL, "Cannot get drive link")
                         }
                     return@mapWithPrevious null
                 }
@@ -347,7 +349,7 @@ class AlbumsViewModel @Inject constructor(
                 )
                     .onFailure { error ->
                         isRefreshing.value = false
-                        error.log(VIEW_MODEL)
+                        error.log(VIEW_MODEL, "Cannot get all album listings")
                         broadcastMessages(
                             userId = userId,
                             message = error.getDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AutoLockDurationsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AutoLockDurationsViewModel.kt
index 1a806a48..cbb46213 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AutoLockDurationsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/AutoLockDurationsViewModel.kt
@@ -26,12 +26,14 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.lock.domain.extension.autoLockDefaultDuration
 import me.proton.android.drive.lock.domain.usecase.GetAutoLockDuration
 import me.proton.android.drive.lock.domain.usecase.UpdateAutoLockDuration
 import me.proton.android.drive.ui.viewevent.AutoLockDurationsViewEvent
 import me.proton.android.drive.ui.viewstate.AutoLockDurationsViewState
 import me.proton.core.compose.component.bottomsheet.RunAction
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import javax.inject.Inject
 import kotlin.time.Duration
@@ -62,7 +64,9 @@ class AutoLockDurationsViewModel @Inject constructor(
         override val onDuration: (Duration) -> Unit = { duration ->
             runAction {
                 viewModelScope.launch {
-                    updateAutoLockDuration(duration)
+                    updateAutoLockDuration(duration).onFailure { error ->
+                        error.log(VIEW_MODEL, "Cannot update auto lock duration")
+                    }
                     dismiss()
                 }
             }
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/BackupIssuesViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/BackupIssuesViewModel.kt
index f87eb8f6..09ec4f88 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/BackupIssuesViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/BackupIssuesViewModel.kt
@@ -29,14 +29,14 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.navigation.Screen
 import me.proton.android.drive.ui.viewevent.BackupIssuesViewEvent
 import me.proton.android.drive.ui.viewstate.BackupIssuesViewState
 import me.proton.core.drive.backup.domain.usecase.GetAllFailedFiles
 import me.proton.core.drive.backup.domain.usecase.RetryBackup
 import me.proton.core.drive.base.data.extension.getDefaultMessage
-import me.proton.core.drive.base.data.extension.log
-import me.proton.core.drive.base.domain.log.LogTag.BACKUP
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.extension.require
@@ -70,7 +70,7 @@ class BackupIssuesViewModel @Inject constructor(
                 backupFile.uriString.toUri()
             })
         }.catch { error ->
-            error.log(BACKUP, "Cannot get all failed files")
+            error.log(VIEW_MODEL, "Cannot get all failed files")
             broadcastMessages(
                 userId = userId,
                 message = error.getDefaultMessage(
@@ -95,7 +95,7 @@ class BackupIssuesViewModel @Inject constructor(
             retryBackup(folderId).onSuccess {
                 onSuccess()
             }.onFailure { error ->
-                error.log(BACKUP, "Cannot retry on backup")
+                error.log(VIEW_MODEL, "Cannot retry on backup")
                 broadcastMessages(
                     userId = userId,
                     message = error.getDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/CommonSharedViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/CommonSharedViewModel.kt
index 52c5377c..12e9f82f 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/CommonSharedViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/CommonSharedViewModel.kt
@@ -39,12 +39,13 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.common.onClick
 import me.proton.android.drive.ui.effect.HomeEffect
 import me.proton.android.drive.ui.effect.HomeTabViewModel
 import me.proton.core.drive.base.domain.entity.TimestampMs
 import me.proton.core.drive.base.domain.extension.getOrNull
-import me.proton.core.drive.base.domain.log.LogTag.SHARING
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.presentation.effect.ListEffect
 import me.proton.core.drive.base.presentation.state.ListContentAppendingState
@@ -193,9 +194,10 @@ abstract class CommonSharedViewModel(
     private fun onRefresh() {
         viewModelScope.launch {
             _listEffect.emit(ListEffect.REFRESH)
-            val linkIds = getAllIds().getOrNull(SHARING, "Cannot get ids")
+            val linkIds = getAllIds().getOrNull(VIEW_MODEL, "Cannot get ids")
                 .orEmpty().map { it.linkId }.toSet()
-            sharedDriveLinks.refresh(linkIds).getOrNull(SHARING, "Cannot refresh drive links")
+            sharedDriveLinks.refresh(linkIds)
+                .onFailure { error -> error.log(VIEW_MODEL, "Cannot refresh drive links") }
         }
     }
 
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ComputersViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ComputersViewModel.kt
index 237ba4db..3d35d127 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ComputersViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ComputersViewModel.kt
@@ -34,12 +34,12 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transform
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.effect.HomeEffect
 import me.proton.android.drive.ui.effect.HomeTabViewModel
 import me.proton.android.drive.ui.viewevent.ComputersViewEvent
 import me.proton.android.drive.ui.viewstate.ComputersViewState
 import me.proton.core.domain.arch.DataResult
-import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.data.extension.logDefaultMessage
 import me.proton.core.drive.base.domain.entity.CryptoProperty
 import me.proton.core.drive.base.domain.entity.TimestampMs
@@ -48,19 +48,20 @@ import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.common.getThemeDrawableId
+import me.proton.core.drive.base.presentation.state.ListContentState
 import me.proton.core.drive.base.presentation.viewmodel.UserViewModel
 import me.proton.core.drive.device.domain.entity.Device
 import me.proton.core.drive.device.domain.entity.DeviceId
 import me.proton.core.drive.device.domain.extension.name
 import me.proton.core.drive.device.domain.usecase.RefreshDevices
 import me.proton.core.drive.drivelink.device.domain.usecase.GetDecryptedDevicesSortedByName
-import me.proton.core.drive.base.presentation.state.ListContentState
 import me.proton.core.drive.files.domain.usecase.ToFirstItemMetricsNotifier
 import me.proton.core.drive.link.domain.entity.FolderId
 import me.proton.core.drive.messagequeue.domain.entity.BroadcastMessage
 import me.proton.core.drive.observability.domain.metrics.common.mobile.performance.PageType
 import me.proton.core.plan.presentation.compose.usecase.ShouldUpgradeStorage
 import javax.inject.Inject
+import me.proton.core.drive.base.data.extension.log as logResult
 import me.proton.core.drive.drivelink.device.presentation.R as DriveLinkDevicePresentation
 import me.proton.core.drive.i18n.R as I18N
 
@@ -107,6 +108,7 @@ class ComputersViewModel @Inject constructor(
     val initialViewState = ComputersViewState(
         title = appContext.getString(I18N.string.computers_title),
         navigationIconResId = me.proton.core.presentation.R.drawable.ic_proton_hamburger,
+        navigationContentDescription = appContext.getString(I18N.string.common_open_side_menu_action),
         notificationDotVisible = false,
         listContentState = listContentState.value,
         isRefreshEnabled = listContentState.value != ListContentState.Loading
@@ -136,7 +138,7 @@ class ComputersViewModel @Inject constructor(
             when (result) {
                 is DataResult.Processing -> listContentState.value = ListContentState.Loading
                 is DataResult.Error -> {
-                    result.log(VIEW_MODEL)
+                    result.logResult(VIEW_MODEL)
                     broadcastMessages(
                         userId = userId,
                         message = result.logDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmDeletionDialogViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmDeletionDialogViewModel.kt
index 9da29f73..cfa2ce8f 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmDeletionDialogViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmDeletionDialogViewModel.kt
@@ -27,11 +27,13 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.transform
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.navigation.Screen
 import me.proton.android.drive.ui.viewevent.ConfirmDeletionViewEvent
 import me.proton.android.drive.ui.viewstate.ConfirmDeletionViewState
 import me.proton.core.domain.arch.mapSuccessValueOrNull
 import me.proton.core.drive.base.domain.extension.filterSuccessOrError
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.presentation.extension.require
 import me.proton.core.drive.base.presentation.viewmodel.UserViewModel
 import me.proton.core.drive.drivelink.crypto.domain.usecase.GetDecryptedDriveLink
@@ -66,7 +68,9 @@ class ConfirmDeletionDialogViewModel @Inject constructor(
     fun viewEvent(onDismiss: () -> Unit) = object : ConfirmDeletionViewEvent {
         override val onConfirm = {
             viewModelScope.launch {
-                deleteFromTrash(userId, linkId)
+                deleteFromTrash(userId, linkId).onFailure{ error ->
+                    error.log(VIEW_MODEL, "Failed to delete from trash ${linkId.id}")
+                }
                 onDismiss()
             }
             Unit
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmEmptyTrashDialogViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmEmptyTrashDialogViewModel.kt
index d0dff657..0b076d93 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmEmptyTrashDialogViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmEmptyTrashDialogViewModel.kt
@@ -24,9 +24,9 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.viewevent.ConfirmEmptyTrashViewEvent
-import me.proton.core.drive.base.data.extension.log
-import me.proton.core.drive.base.domain.log.LogTag.TRASH
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.presentation.extension.require
 import me.proton.core.drive.base.presentation.viewmodel.UserViewModel
 import me.proton.core.drive.trash.domain.usecase.EmptyTrash
@@ -46,7 +46,7 @@ class ConfirmEmptyTrashDialogViewModel @Inject constructor(
         override val onConfirm = {
             viewModelScope.launch {
                 emptyTrash(userId, volumeId).onFailure { error ->
-                    error.log(TRASH, "Cannot empty trash volumeId: ${volumeId.id}")
+                    error.log(VIEW_MODEL, "Cannot empty trash volumeId: ${volumeId.id}")
                 }
                 dismiss()
             }
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmLeaveAlbumDialogViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmLeaveAlbumDialogViewModel.kt
index 91856146..bd2dba27 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmLeaveAlbumDialogViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmLeaveAlbumDialogViewModel.kt
@@ -33,15 +33,15 @@ import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import me.proton.android.drive.extension.getDefaultMessage
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.photos.domain.usecase.AddPhotosToStream
 import me.proton.android.drive.photos.presentation.extension.processAddToStream
 import me.proton.android.drive.photos.presentation.viewevent.ConfirmLeaveAlbumDialogViewEvent
 import me.proton.android.drive.photos.presentation.viewstate.ConfirmLeaveAlbumDialogViewState
 import me.proton.android.drive.usecase.LeaveShare
 import me.proton.core.domain.arch.mapSuccessValueOrNull
-import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.domain.extension.filterSuccessOrError
-import me.proton.core.drive.base.domain.log.LogTag
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.viewmodel.UserViewModel
@@ -107,12 +107,13 @@ class ConfirmLeaveAlbumDialogViewModel @Inject constructor(
 
     private fun leaveAlbumWithoutSaving(dismiss: () -> Unit) {
         viewModelScope.launch {
-            album.value?.let {
+            album.value?.let { album ->
                 isWithoutSavingOperationInProgress.value = true
-                leaveShare(it)
-                    .onSuccess {
-                        dismiss()
-                    }
+                leaveShare(album).onSuccess {
+                    dismiss()
+                }.onFailure { error ->
+                    error.log(VIEW_MODEL, "Failed to leave share for ${album.id.id}")
+                }
                 isWithoutSavingOperationInProgress.value = false
             }
         }
@@ -123,7 +124,7 @@ class ConfirmLeaveAlbumDialogViewModel @Inject constructor(
             album.value?.let {
                 isSavingOperationInProgress.value = true
                 addPhotosToStream(albumId).onFailure { error ->
-                    error.log(LogTag.ALBUM, "Cannot copy photo to stream: ${albumId.id}")
+                    error.log(VIEW_MODEL, "Cannot copy photo to stream: ${albumId.id}")
                     broadcastMessages(
                         userId = userId,
                         message = error.getDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmSkipIssuesDialogViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmSkipIssuesDialogViewModel.kt
index bc3bf005..bd155c46 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmSkipIssuesDialogViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmSkipIssuesDialogViewModel.kt
@@ -25,12 +25,12 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.navigation.Screen
 import me.proton.android.drive.ui.viewevent.ConfirmSkipIssuesViewEvent
 import me.proton.core.drive.backup.domain.usecase.DeleteAllFailedFiles
 import me.proton.core.drive.base.data.extension.getDefaultMessage
-import me.proton.core.drive.base.data.extension.log
-import me.proton.core.drive.base.domain.log.LogTag.BACKUP
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.extension.require
@@ -65,7 +65,7 @@ class ConfirmSkipIssuesDialogViewModel @Inject constructor(
             deleteAllFailedFiles(folderId).onSuccess {
                 onSuccess()
             }.onFailure { error ->
-                error.log(BACKUP, "Cannot delete failed files")
+                error.log(VIEW_MODEL, "Cannot delete failed files")
                 broadcastMessages(
                     userId = userId,
                     message = error.getDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmStopAllSharingDialogViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmStopAllSharingDialogViewModel.kt
index 77d92a1e..377c48c2 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmStopAllSharingDialogViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmStopAllSharingDialogViewModel.kt
@@ -26,13 +26,11 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.viewevent.ConfirmStopSharingViewEvent
 import me.proton.android.drive.ui.viewstate.ConfirmStopSharingViewState
-import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.extension.require
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmStopLinkSharingDialogViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmStopLinkSharingDialogViewModel.kt
index 9e45b67e..d871cc56 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmStopLinkSharingDialogViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmStopLinkSharingDialogViewModel.kt
@@ -28,10 +28,10 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.navigation.Screen
 import me.proton.android.drive.ui.viewevent.ConfirmStopSharingViewEvent
 import me.proton.android.drive.ui.viewstate.ConfirmStopSharingViewState
-import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.extension.require
@@ -96,7 +96,7 @@ class ConfirmStopLinkSharingDialogViewModel @Inject constructor(
             confirm()
         }.onFailure { error ->
             errorMessage.emit(context.getString(I18N.string.description_files_stop_sharing_action_error))
-            error.log(VIEW_MODEL)
+            error.log(VIEW_MODEL, "Failed to delete share url for ${linkId.id}")
         }
     }
 }
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmStopSyncFolderDialogViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmStopSyncFolderDialogViewModel.kt
index 4d3807bf..2201bcb8 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmStopSyncFolderDialogViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ConfirmStopSyncFolderDialogViewModel.kt
@@ -27,6 +27,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.navigation.Screen
 import me.proton.android.drive.ui.viewevent.ConfirmStopSyncFolderViewEvent
 import me.proton.android.drive.ui.viewstate.ConfirmStopSyncFolderViewState
@@ -34,8 +35,7 @@ import me.proton.core.drive.backup.domain.entity.BackupFolder
 import me.proton.core.drive.backup.domain.usecase.DisableBackupForFolder
 import me.proton.core.drive.backup.domain.usecase.GetAllBuckets
 import me.proton.core.drive.base.data.extension.getDefaultMessage
-import me.proton.core.drive.base.data.extension.log
-import me.proton.core.drive.base.domain.log.LogTag.BACKUP
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.extension.require
@@ -79,7 +79,7 @@ class ConfirmStopSyncFolderDialogViewModel @Inject constructor(
             disableBackupForFolder(BackupFolder(id, folderId)).onSuccess {
                 onSuccess()
             }.onFailure { error ->
-                error.log(BACKUP, "Cannot stop sync for folder: $id")
+                error.log(VIEW_MODEL, "Cannot stop sync for folder: $id")
                 broadcastMessages(
                     userId = userId,
                     message = error.getDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/FileOrFolderOptionsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/FileOrFolderOptionsViewModel.kt
index 2a205aaa..a89a11a3 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/FileOrFolderOptionsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/FileOrFolderOptionsViewModel.kt
@@ -32,6 +32,7 @@ import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import me.proton.android.drive.extension.getDefaultMessage
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.photos.domain.usecase.AddPhotosToStream
 import me.proton.android.drive.photos.domain.usecase.RemovePhotosFromAlbum
 import me.proton.android.drive.photos.presentation.extension.processAddToStream
@@ -49,10 +50,8 @@ import me.proton.android.drive.usecase.LeaveShare
 import me.proton.android.drive.usecase.NotifyActivityNotFound
 import me.proton.android.drive.usecase.OpenProtonDocumentInBrowser
 import me.proton.core.domain.arch.mapSuccessValueOrNull
-import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.domain.entity.Permissions
 import me.proton.core.drive.base.domain.extension.mapWithPrevious
-import me.proton.core.drive.base.domain.log.LogTag
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
@@ -189,7 +188,9 @@ class FileOrFolderOptionsViewModel @Inject constructor(
                     }
                     is Option.OfflineToggle -> option.build(runAction) { driveLink ->
                         viewModelScope.launch {
-                            toggleOffline(driveLink)
+                            toggleOffline(driveLink).onFailure { error ->
+                                error.log(VIEW_MODEL, "Failed to toggle offline for ${driveLink.id.id}")
+                            }
                             deselectLinks()
                         }
                     }
@@ -224,13 +225,17 @@ class FileOrFolderOptionsViewModel @Inject constructor(
                     }
                     is Option.RemoveMe -> option.build(runAction) { driveLink ->
                         viewModelScope.launch {
-                            leaveShare(driveLink)
+                            leaveShare(driveLink).onFailure { error ->
+                                error.log(VIEW_MODEL, "Failed to leave share for ${driveLink.id.id}")
+                            }
                             deselectLinks()
                         }
                     }
                     is Option.OpenInBrowser -> option.build(runAction) { driveLink ->
                         viewModelScope.launch {
-                            openProtonDocumentInBrowser(driveLink)
+                            openProtonDocumentInBrowser(driveLink).onFailure { error ->
+                                error.log(VIEW_MODEL, "Failed to open proton document in browser")
+                            }
                             deselectLinks()
                         }
                     }
@@ -259,19 +264,19 @@ class FileOrFolderOptionsViewModel @Inject constructor(
                         }
                     }
                     is Option.AddToAlbums -> option.build(runAction) { driveLink ->
-                            if (selectionId != null) {
-                                navigateToAddToAlbumsOptions(selectionId)
-                            } else {
-                                viewModelScope.launch {
-                                    selectLinks(listOf(driveLink.id))
-                                        .onFailure { error ->
-                                            error.log(VIEW_MODEL, "Failed to select links")
-                                        }
-                                        .onSuccess { selectionId ->
-                                            navigateToAddToAlbumsOptions(selectionId)
-                                        }
-                                }
+                        if (selectionId != null) {
+                            navigateToAddToAlbumsOptions(selectionId)
+                        } else {
+                            viewModelScope.launch {
+                                selectLinks(listOf(driveLink.id))
+                                    .onFailure { error ->
+                                        error.log(VIEW_MODEL, "Failed to select links")
+                                    }
+                                    .onSuccess { selectionId ->
+                                        navigateToAddToAlbumsOptions(selectionId)
+                                    }
                             }
+                        }
                     }
                     else -> throw IllegalStateException(
                         "Option ${option.javaClass.simpleName} is not found. Did you forget to add it?"
@@ -291,7 +296,9 @@ class FileOrFolderOptionsViewModel @Inject constructor(
     private fun deselectLinks() {
         viewModelScope.launch {
             if (selectionId != null) {
-                deselectLinks(selectionId)
+                deselectLinks(selectionId).onFailure { error ->
+                    error.log(VIEW_MODEL, "Failed to deselect links")
+                }
             }
         }
     }
@@ -333,7 +340,7 @@ class FileOrFolderOptionsViewModel @Inject constructor(
             albumId = requireNotNull(albumId),
             newCoverFileId = driveLink.id
         ).onFailure { error ->
-            error.log(LogTag.ALBUM, "Cannot update album cover: ${driveLink.id.id}")
+            error.log(VIEW_MODEL, "Cannot update album cover: ${driveLink.id.id}")
             broadcastMessages(
                 userId = userId,
                 message = error.getDefaultMessage(
@@ -359,7 +366,7 @@ class FileOrFolderOptionsViewModel @Inject constructor(
             photoIds = listOf(fileId),
             albumId = requireNotNull(albumId) { "album id is required to save shared photo"},
         ).onFailure { error ->
-            error.log(LogTag.ALBUM, "Cannot copy photo to stream: ${fileId.id}")
+            error.log(VIEW_MODEL, "Cannot copy photo to stream: ${fileId.id}")
             broadcastMessages(
                 userId = userId,
                 message = error.getDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/FilesViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/FilesViewModel.kt
index 22e88629..5ee2beb4 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/FilesViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/FilesViewModel.kt
@@ -48,6 +48,7 @@ import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.launch
 import me.proton.android.drive.document.scanner.domain.usecase.IsScannerAvailable
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.common.onClick
 import me.proton.android.drive.ui.effect.HomeEffect
 import me.proton.android.drive.ui.effect.HomeTabViewModel
@@ -60,7 +61,7 @@ import me.proton.android.drive.usecase.OpenProtonDocumentInBrowser
 import me.proton.core.domain.arch.onSuccess
 import me.proton.core.drive.base.data.datastore.GetUserDataStore
 import me.proton.core.drive.base.data.extension.getDefaultMessage
-import me.proton.core.drive.base.data.extension.log
+import me.proton.core.drive.base.data.extension.log as logResult
 import me.proton.core.drive.base.domain.entity.Percentage
 import me.proton.core.drive.base.domain.entity.Permissions
 import me.proton.core.drive.base.domain.entity.TimestampMs
@@ -104,7 +105,6 @@ import me.proton.core.drive.observability.domain.metrics.common.mobile.performan
 import me.proton.core.drive.share.domain.entity.ShareId
 import me.proton.core.drive.sorting.domain.entity.Sorting
 import me.proton.core.drive.sorting.domain.usecase.GetSorting
-import me.proton.core.drive.upload.data.extension.logTag
 import me.proton.core.drive.upload.domain.usecase.CancelUploadFile
 import me.proton.core.drive.upload.domain.usecase.GetUploadProgress
 import me.proton.core.drive.user.domain.extension.isFree
@@ -179,7 +179,7 @@ class FilesViewModel @Inject constructor(
                         }
                         .onFailure { error ->
                             onFilesDriveLinkError(userId, previous, error, listContentState)
-                            error.log(VIEW_MODEL, "Cannot get drive link for ${folderId?.id}")
+                            error.logResult(VIEW_MODEL, "Cannot get drive link for ${folderId?.id}")
                             toFirstItemMetricsNotifier.reset()
                         }
                     return@mapWithPrevious null
@@ -245,6 +245,11 @@ class FilesViewModel @Inject constructor(
         } else {
             CorePresentation.drawable.ic_arrow_back
         },
+        navigationContentDescription = if (isRootFolder && selected.value.isEmpty()) {
+            appContext.getString(I18N.string.common_open_side_menu_action)
+        } else {
+            appContext.getString(I18N.string.common_back_action)
+        },
         drawerGesturesEnabled = isRootFolder,
         listContentState = listContentState.value,
         listContentAppendingState = listContentAppendingState.value,
@@ -311,6 +316,13 @@ class FilesViewModel @Inject constructor(
             } else {
                 CorePresentation.drawable.ic_arrow_back
             },
+            navigationContentDescription = if (showHamburgerMenuIcon) {
+                appContext.getString(I18N.string.common_open_side_menu_action)
+            } else if (selected.isNotEmpty()) {
+                appContext.getString(I18N.string.common_close_action)
+            } else {
+                appContext.getString(I18N.string.common_back_action)
+            },
             sorting = sorting,
             listContentState = listContentState,
             listContentAppendingState = appendingState,
@@ -510,7 +522,7 @@ class FilesViewModel @Inject constructor(
     private fun onCancelUpload(uploadFileLink: UploadFileLink) {
         viewModelScope.launch {
             cancelUploadFile(uploadFileLink).onFailure { error ->
-                error.log(uploadFileLink.logTag(), "Cannot cancel upload")
+                error.log(VIEW_MODEL, "Cannot cancel upload")
                 _homeEffect.emit(
                     HomeEffect.ShowSnackbar(
                         error.getDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/GetMoreFreeStorageViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/GetMoreFreeStorageViewModel.kt
index 20af4617..576ad5d7 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/GetMoreFreeStorageViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/GetMoreFreeStorageViewModel.kt
@@ -38,7 +38,6 @@ import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.extension.asHumanReadableString
 import me.proton.core.drive.base.presentation.viewmodel.UserViewModel
-import me.proton.core.drive.feature.flag.domain.usecase.GetFeatureFlagFlow
 import me.proton.core.drive.messagequeue.domain.entity.BroadcastMessage
 import javax.inject.Inject
 import me.proton.core.drive.base.presentation.R as BasePresentation
@@ -50,7 +49,6 @@ class GetMoreFreeStorageViewModel @Inject constructor(
     @ApplicationContext private val appContext: Context,
     configurationProvider: ConfigurationProvider,
     private val broadcastMessages: BroadcastMessages,
-    getFeatureFlag: GetFeatureFlagFlow,
     savedStateHandle: SavedStateHandle,
 ) : ViewModel(), UserViewModel by UserViewModel(savedStateHandle) {
     private val uploadAFile = GetMoreFreeStorageViewState.Action(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/HostFilesViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/HostFilesViewModel.kt
index a3978df0..96c2c703 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/HostFilesViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/HostFilesViewModel.kt
@@ -80,6 +80,7 @@ abstract class HostFilesViewModel(
         titleResId = I18N.string.title_my_files,
         sorting = Sorting.DEFAULT,
         navigationIconResId = 0,
+        navigationContentDescription = null,
         drawerGesturesEnabled = false,
         listContentState = listContentState.value,
         listContentAppendingState = listContentAppendingState.value,
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/MoveToFolderViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/MoveToFolderViewModel.kt
index 49b2e32a..16b25e47 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/MoveToFolderViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/MoveToFolderViewModel.kt
@@ -36,13 +36,15 @@ import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
+import me.proton.android.drive.ui.handler.FolderCreatedHandler
+import me.proton.android.drive.ui.handler.FolderCreatedHandlerDelegate
 import me.proton.android.drive.ui.navigation.Screen
 import me.proton.android.drive.ui.viewevent.MoveToFolderViewEvent
 import me.proton.android.drive.ui.viewstate.MoveFileViewState
 import me.proton.core.domain.arch.mapSuccessValueOrNull
-import me.proton.android.drive.ui.handler.FolderCreatedHandler
-import me.proton.android.drive.ui.handler.FolderCreatedHandlerDelegate
 import me.proton.core.drive.base.domain.log.LogTag
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.presentation.common.Action
 import me.proton.core.drive.drivelink.crypto.domain.usecase.DecryptDriveLinks
@@ -163,6 +165,11 @@ class MoveToFolderViewModel @Inject constructor(
             } else {
                 CorePresentation.drawable.ic_arrow_back
             },
+            navigationContentDescription = if (parentLink == null || isRoot) {
+                appContext.getString(I18N.string.common_close_action)
+            } else {
+                appContext.getString(I18N.string.common_back_action)
+            },
             driveLinks = decryptDriveLinks(driveLinksToMove)
                 .map { driveLink -> if (driveLink.isNameEncrypted) "" else driveLink.name },
         )
@@ -203,8 +210,19 @@ class MoveToFolderViewModel @Inject constructor(
         } else if (folder.id == parentId) {
             CoreLogger.w(LogTag.MOVE, "folder same as parent, move aborted")
         } else {
-            moveFile(userId, driveLinksToMove.value.map { driveLink -> driveLink.id }, folder.id)
-            selectionId?.let { deselectLinks(selectionId) }
+            val linkIds = driveLinksToMove.value.map { driveLink -> driveLink.id }
+            moveFile(
+                userId = userId,
+                linkIds = linkIds,
+                parentId = folder.id,
+            ).onFailure { error ->
+                error.log(VIEW_MODEL, "Failed to move files for ${linkIds.map { it.id }}")
+            }
+            selectionId?.let {
+                deselectLinks(selectionId).onFailure { error ->
+                    error.log(VIEW_MODEL, "Failed to deselect links")
+                }
+            }
             navigateBack()
         }
     }
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/MultipleFileOrFolderOptionsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/MultipleFileOrFolderOptionsViewModel.kt
index b73f513b..60bf33ee 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/MultipleFileOrFolderOptionsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/MultipleFileOrFolderOptionsViewModel.kt
@@ -28,6 +28,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import me.proton.android.drive.extension.getDefaultMessage
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.photos.domain.usecase.RemovePhotosFromAlbum
 import me.proton.android.drive.photos.presentation.extension.processRemove
 import me.proton.android.drive.ui.options.Option
@@ -36,7 +37,6 @@ import me.proton.android.drive.ui.options.filterAll
 import me.proton.android.drive.ui.options.filterPermissions
 import me.proton.android.drive.ui.options.filterPhotoTag
 import me.proton.android.drive.ui.options.filterShare
-import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
@@ -105,8 +105,15 @@ class MultipleFileOrFolderOptionsViewModel @Inject constructor(
                         runAction = runAction,
                         moveToTrash = {
                             viewModelScope.launch {
-                                sendToTrash(userId, driveLinks)
-                                deselectLinks(selectionId)
+                                sendToTrash(userId, driveLinks).onFailure { error ->
+                                    error.log(
+                                        VIEW_MODEL,
+                                        "Failed to send to trash for ${driveLinks.map { it.id.id }}"
+                                    )
+                                }
+                                deselectLinks(selectionId).onFailure { error ->
+                                    error.log(VIEW_MODEL, "Failed to deselect links")
+                                }
                             }
                         },
                     )
@@ -121,7 +128,9 @@ class MultipleFileOrFolderOptionsViewModel @Inject constructor(
                         tagPhotos = {
                             viewModelScope.launch {
                                 scanPhotoForTags(driveLinks)
-                                deselectLinks(selectionId)
+                                deselectLinks(selectionId).onFailure { error ->
+                                    error.log(VIEW_MODEL, "Failed to deselect links")
+                                }
                             }
                         }
                     )
@@ -131,7 +140,12 @@ class MultipleFileOrFolderOptionsViewModel @Inject constructor(
                             viewModelScope.launch {
                                 exportToDownload(
                                     driveLinks.filterIsInstance<DriveLink.File>().map { driveLink -> driveLink.id }
-                                )
+                                ).onFailure { error ->
+                                    error.log(
+                                        VIEW_MODEL,
+                                        "Failed to export to download for ${driveLinks.map { it.id.id }}"
+                                    )
+                                }
                             }
                         }
                     )
@@ -149,7 +163,9 @@ class MultipleFileOrFolderOptionsViewModel @Inject constructor(
                                     driveLinks
                                         .filterIsInstance<DriveLink.File>()
                                 )
-                                deselectLinks(selectionId)
+                                deselectLinks(selectionId).onFailure { error ->
+                                    error.log(VIEW_MODEL, "Failed to deselect links")
+                                }
                             }
                         },
                     )
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/MultiplePhotosOptionsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/MultiplePhotosOptionsViewModel.kt
index 248ad209..9de20305 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/MultiplePhotosOptionsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/MultiplePhotosOptionsViewModel.kt
@@ -155,7 +155,7 @@ abstract class MultiplePhotosOptionsViewModel(
                     .let { photoListings ->
                         addToAlbumInfo(albumId, photoListings.toSet())
                             .onFailure { error ->
-                                error.log(VIEW_MODEL, "Failed to add photos to album info")
+                                error.log(VIEW_MODEL, "Failed to add photos to album info for ${albumId.id}")
                                 error.broadcast()
                             }
                             .onSuccess {
@@ -163,7 +163,7 @@ abstract class MultiplePhotosOptionsViewModel(
                                 showAddToAlbumStartMessage()
                                 addPhotosToAlbum(albumId)
                                     .onFailure { error ->
-                                        error.log(VIEW_MODEL, "Failed to add photos to album")
+                                        error.log(VIEW_MODEL, "Failed to add photos to album for ${albumId.id}")
                                         error.broadcast()
                                     }
                                     .onSuccess { result ->
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/OfflineViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/OfflineViewModel.kt
index 6b91f2c1..fa5f6dcb 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/OfflineViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/OfflineViewModel.kt
@@ -43,6 +43,7 @@ import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.common.onClick
 import me.proton.android.drive.ui.navigation.PagerType
 import me.proton.android.drive.ui.navigation.Screen
@@ -51,9 +52,8 @@ import me.proton.android.drive.ui.viewstate.OfflineViewState
 import me.proton.android.drive.usecase.OpenProtonDocumentInBrowser
 import me.proton.core.domain.arch.onSuccess
 import me.proton.core.drive.base.data.extension.getDefaultMessage
-import me.proton.core.drive.base.data.extension.log
+import me.proton.core.drive.base.data.extension.log as logResult
 import me.proton.core.drive.base.domain.entity.Percentage
-import me.proton.core.drive.base.domain.entity.onProcessing
 import me.proton.core.drive.base.domain.extension.onFailure
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
@@ -78,7 +78,6 @@ import me.proton.core.drive.messagequeue.domain.entity.BroadcastMessage
 import me.proton.core.drive.share.domain.entity.ShareId
 import me.proton.core.drive.sorting.domain.entity.Sorting
 import me.proton.core.drive.sorting.domain.usecase.GetSorting
-import me.proton.core.util.kotlin.CoreLogger
 import me.proton.drive.android.settings.domain.entity.LayoutType
 import me.proton.drive.android.settings.domain.usecase.GetLayoutType
 import me.proton.drive.android.settings.domain.usecase.ToggleLayoutType
@@ -113,7 +112,7 @@ class OfflineViewModel @Inject constructor(
                 .onSuccess { driveLink ->
                     return@map driveLink
                 }
-                .onFailure { error -> error.log(VIEW_MODEL) }
+                .onFailure { error -> error.logResult(VIEW_MODEL, "Cannot get drive link for ${folderId?.id}") }
             return@map null
         }.stateIn(viewModelScope, SharingStarted.Eagerly, null)
     val driveLinks: Flow<PagingData<DriveLink>> = flowOf(folderId).flatMapLatest { folderId ->
@@ -135,6 +134,7 @@ class OfflineViewModel @Inject constructor(
             title = savedStateHandle.get(Screen.Files.FOLDER_NAME),
             titleResId = I18N.string.title_offline_available,
             navigationIconResId = CorePresentation.drawable.ic_arrow_back,
+            navigationContentDescription = appContext.getString(I18N.string.common_close_action),
             drawerGesturesEnabled = false,
             sorting = Sorting.DEFAULT,
             listContentState = listContentState.value,
@@ -267,7 +267,14 @@ class OfflineViewModel @Inject constructor(
     }
 
     private fun onToggleLayout() {
-        viewModelScope.launch { toggleLayoutType(userId = userId, currentLayoutType = layoutType.value) }
+        viewModelScope.launch {
+            toggleLayoutType(
+                userId = userId,
+                currentLayoutType = layoutType.value
+            ).onFailure { error ->
+                error.log(VIEW_MODEL, "Failed to toggle layout type")
+            }
+        }
     }
 
     private fun retryList() {
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/OnboardingViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/OnboardingViewModel.kt
index 581d815c..4bfaf05a 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/OnboardingViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/OnboardingViewModel.kt
@@ -30,6 +30,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.photos.domain.entity.PhotoBackupState
 import me.proton.android.drive.photos.domain.usecase.EnablePhotosBackup
 import me.proton.android.drive.photos.domain.usecase.GetPhotosDriveLink
@@ -39,19 +40,16 @@ import me.proton.android.drive.photos.presentation.viewstate.BackupPermissionsVi
 import me.proton.android.drive.usecase.MarkOnboardingAsShown
 import me.proton.core.drive.backup.domain.entity.BackupPermissions
 import me.proton.core.drive.backup.domain.manager.BackupPermissionsManager
-import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.domain.entity.Bytes
 import me.proton.core.drive.base.domain.extension.firstSuccessOrError
 import me.proton.core.drive.base.domain.extension.getOrNull
 import me.proton.core.drive.base.domain.extension.toResult
-import me.proton.core.drive.base.domain.log.LogTag
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.presentation.viewevent.OnboardingViewEvent
 import me.proton.core.drive.base.presentation.viewmodel.UserViewModel
 import me.proton.core.drive.base.presentation.viewstate.OnboardingViewState
 import me.proton.core.drive.user.domain.extension.isFree
 import me.proton.core.user.domain.usecase.GetUser
-import me.proton.core.util.kotlin.CoreLogger
 import javax.inject.Inject
 import me.proton.core.drive.i18n.R as I18N
 
@@ -147,7 +145,7 @@ class OnboardingViewModel @Inject constructor(
             getPhotosDriveLink(userId)
                 .firstSuccessOrError()
                 .toResult()
-                .getOrNull(LogTag.BACKUP, "Getting photos drive link during onboarding failed")
+                .getOrNull(VIEW_MODEL, "Getting photos drive link during onboarding failed")
                 ?.id
                 ?.let { photoRootId ->
                     enablePhotosBackup(photoRootId)
@@ -158,7 +156,7 @@ class OnboardingViewModel @Inject constructor(
                             }
                         }
                         .onFailure { error ->
-                            error.log(LogTag.BACKUP, "Enabling backup during onboarding failed")
+                            error.log(VIEW_MODEL, "Enabling backup during onboarding failed")
                             dismiss?.invoke()
                         }
                 }
@@ -171,8 +169,9 @@ class OnboardingViewModel @Inject constructor(
 
     private fun onboardingShown() {
         viewModelScope.launch {
-            markOnboardingAsShown()
-                .getOrNull(VIEW_MODEL, "Marking onboarding as shown failed")
+            markOnboardingAsShown().onFailure { error ->
+                error.log(VIEW_MODEL, "Marking onboarding as shown failed")
+            }
         }
     }
 }
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ParentFolderOptionsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ParentFolderOptionsViewModel.kt
index 9338a6d6..c6f3ae5f 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ParentFolderOptionsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ParentFolderOptionsViewModel.kt
@@ -208,14 +208,13 @@ class ParentFolderOptionsViewModel @Inject constructor(
                     folder = folder,
                     uploadFileDescriptions = uriStrings.map { uri -> UploadFileDescription(uri) },
                     priority = UploadFileLink.USER_PRIORITY,
-                )
-                    .onFailure { error ->
-                        error.log(VIEW_MODEL, "Upload files failed")
-                        if (error is NotEnoughSpaceException) {
-                            navigateToStorageFull()
-                            return@launch
-                        }
+                ).onFailure { error ->
+                    error.log(VIEW_MODEL, "Upload files failed in ${folder.id.id}")
+                    if (error is NotEnoughSpaceException) {
+                        navigateToStorageFull()
+                        return@launch
                     }
+                }
             }
             dismiss()
         }
@@ -228,10 +227,9 @@ class ParentFolderOptionsViewModel @Inject constructor(
                     folderId = folder.id,
                     uriString = uriString,
                     shouldBroadcastMessage = true,
-                )
-                    .onFailure { error ->
-                        error.log(VIEW_MODEL, "Upload folder failed")
-                    }
+                ).onFailure { error ->
+                    error.log(VIEW_MODEL, "Upload folder failed in ${folder.id.id}")
+                }
             }
             dismiss()
         }
@@ -247,15 +245,14 @@ class ParentFolderOptionsViewModel @Inject constructor(
                         uploadFileDescriptions = listOf(UploadFileDescription(uri.toString())),
                         shouldDeleteSource = true,
                         priority = UploadFileLink.USER_PRIORITY,
-                    )
-                        .onFailure { error ->
-                            error.log(VIEW_MODEL, "Upload file failed")
-                            if (error is NotEnoughSpaceException) {
-                                navigateToStorageFull()
-                                updatePhotoUri(null)
-                                return@launch
-                            }
+                    ).onFailure { error ->
+                        error.log(VIEW_MODEL, "Upload file failed in ${folder.id.id}")
+                        if (error is NotEnoughSpaceException) {
+                            navigateToStorageFull()
+                            updatePhotoUri(null)
+                            return@launch
                         }
+                    }
                 }
             } else {
                 withContext(Job() + Dispatchers.IO) {
@@ -351,6 +348,7 @@ class ParentFolderOptionsViewModel @Inject constructor(
                 navigateToPreview(fileId)
             }
             .onFailure { error ->
+                error.log(VIEW_MODEL, "Failed to create new document $documentType in ${folderId.id}")
                 broadcastMessages(
                     userId = userId,
                     message = error.getDefaultMessage(appContext, configurationProvider.useExceptionMessage),
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosBackupViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosBackupViewModel.kt
index 78a789be..9fe58840 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosBackupViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosBackupViewModel.kt
@@ -33,6 +33,7 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.launch
 import me.proton.android.drive.extension.getDefaultMessage
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.photos.domain.entity.PhotoBackupState
 import me.proton.android.drive.photos.domain.usecase.GetPhotosConfiguration
 import me.proton.android.drive.photos.domain.usecase.GetPhotosDriveLink
@@ -45,11 +46,10 @@ import me.proton.android.drive.ui.viewstate.PhotosBackupViewState
 import me.proton.android.drive.ui.viewstate.TagsMigrationProgressState
 import me.proton.core.domain.arch.mapSuccessValueOrNull
 import me.proton.core.drive.backup.domain.entity.BackupNetworkType
-import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.domain.exception.DriveException
 import me.proton.core.drive.base.domain.extension.firstSuccessOrError
 import me.proton.core.drive.base.domain.extension.toResult
-import me.proton.core.drive.base.domain.log.LogTag.BACKUP
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.domain.usecase.IsIgnoringBatteryOptimizations
@@ -180,7 +180,7 @@ class PhotosBackupViewModel @Inject constructor(
                         }
                     }
                 }.onFailure { error ->
-                    error.log(BACKUP)
+                    error.log(VIEW_MODEL, "Failed to toggle backup")
                     val userError = if (error.cause is DriveException) {
                         error.cause as DriveException
                     } else {
@@ -201,7 +201,7 @@ class PhotosBackupViewModel @Inject constructor(
         override val onToggleMobileData = {
             viewModelScope.launch {
                 togglePhotosNetworkConfiguration(userId).onFailure { error ->
-                    error.log(BACKUP)
+                    error.log(VIEW_MODEL, "Failed to toggle photos network configuration")
                     broadcastMessages(
                         userId = userId,
                         message = error.getDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosExportDataViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosExportDataViewModel.kt
index 9ccd6961..afc66d93 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosExportDataViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosExportDataViewModel.kt
@@ -35,7 +35,7 @@ import me.proton.android.drive.ui.viewevent.PhotosExportDataViewEvent
 import me.proton.android.drive.ui.viewstate.PhotosExportDataViewState
 import me.proton.android.drive.usecase.ExportPhotoData
 import me.proton.android.drive.usecase.SendFile
-import me.proton.core.drive.base.domain.log.LogTag.BACKUP
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.viewmodel.UserViewModel
@@ -82,7 +82,7 @@ class PhotosExportDataViewModel @Inject constructor(
 
     private suspend fun onExportData(context: Context) {
         val onFailure: (exception: Throwable) -> Unit = { error ->
-            error.log(BACKUP)
+            error.log(VIEW_MODEL, "Failed to export data")
             broadcastMessages(
                 userId = userId,
                 message = error.getDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosPickerAndSelectionViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosPickerAndSelectionViewModel.kt
index 9db47228..f3ba5b93 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosPickerAndSelectionViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosPickerAndSelectionViewModel.kt
@@ -23,6 +23,7 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.photos.domain.usecase.AddToAlbumInfo
 import me.proton.android.drive.photos.domain.usecase.GetAddToAlbumPhotoListings
 import me.proton.android.drive.photos.domain.usecase.GetPhotoListingCount
@@ -118,11 +119,19 @@ open class PhotosPickerAndSelectionViewModel(
     private fun addToAlbumAndToSelected(driveLink: DriveLink.File) = viewModelScope.launch {
         val photoListings = setOf(driveLink.toVolumePhotoListing())
         if (destinationAlbumId == null) {
-            addToAlbumInfo(photoListings)
-                .getOrNull(VIEW_MODEL, "Failed to add to album info for new album ShareId=${driveLink.id.shareId.id.logId()}, LinkId=${driveLink.id.id.logId()}")
+            addToAlbumInfo(photoListings).onFailure { error ->
+                error.log(
+                    VIEW_MODEL,
+                    "Failed to add to album info for new album ShareId=${driveLink.id.shareId.id.logId()}, LinkId=${driveLink.id.id.logId()}"
+                )
+            }
         } else {
-            addToAlbumInfo(destinationAlbumId, photoListings)
-                .getOrNull(VIEW_MODEL, "Failed to add to album info ShareId=${driveLink.id.shareId.id.logId()}, LinkId=${driveLink.id.id.logId()}")
+            addToAlbumInfo(destinationAlbumId, photoListings).onFailure { error ->
+                error.log(
+                    VIEW_MODEL,
+                    "Failed to add to album info ShareId=${driveLink.id.shareId.id.logId()}, LinkId=${driveLink.id.id.logId()}"
+                )
+            }
         }
         addSelected(listOf(driveLink.id))
     }
@@ -130,11 +139,19 @@ open class PhotosPickerAndSelectionViewModel(
     private fun removeFromAlbumAndFromSelected(driveLink: DriveLink.File) = viewModelScope.launch {
         val photoListings = setOf(driveLink.toVolumePhotoListing())
         if (destinationAlbumId == null) {
-            removeFromAlbumInfo(photoListings)
-                .getOrNull(VIEW_MODEL, "Failed to remove from album info for new album ShareId=${driveLink.id.shareId.id.logId()}, LinkId=${driveLink.id.id.logId()}")
+            removeFromAlbumInfo(photoListings).onFailure { error ->
+                error.log(
+                    VIEW_MODEL,
+                    "Failed to remove from album info for new album ShareId=${driveLink.id.shareId.id.logId()}, LinkId=${driveLink.id.id.logId()}"
+                )
+            }
         } else {
-            removeFromAlbumInfo(destinationAlbumId, photoListings)
-                .getOrNull(VIEW_MODEL, "Failed to remove from album info ShareId=${driveLink.id.shareId.id.logId()}, LinkId=${driveLink.id.id.logId()}")
+            removeFromAlbumInfo(destinationAlbumId, photoListings).onFailure { error ->
+                error.log(
+                    VIEW_MODEL,
+                    "Failed to remove from album info ShareId=${driveLink.id.shareId.id.logId()}, LinkId=${driveLink.id.id.logId()}"
+                )
+            }
         }
         removeSelected(listOf(driveLink.id))
     }
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosUpsellViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosUpsellViewModel.kt
index de7a8a31..fd909121 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosUpsellViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosUpsellViewModel.kt
@@ -23,9 +23,9 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.photos.presentation.viewevent.PhotosUpsellViewEvent
-import me.proton.core.drive.base.data.extension.log
-import me.proton.core.drive.base.domain.log.LogTag.PHOTO
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.presentation.component.RunAction
 import me.proton.core.drive.base.presentation.viewmodel.UserViewModel
 import me.proton.core.drive.telemetry.domain.event.PhotosEvent.UpsellPhotosAccepted
@@ -60,7 +60,7 @@ class PhotosUpsellViewModel @Inject constructor(
         override val onDismiss = {
             viewModelScope.launch {
                 cancelUserMessage(userId, UserMessage.UPSELL_PHOTOS).onFailure { error ->
-                    error.log(PHOTO, "Cannot cancel upsell photos message")
+                    error.log(VIEW_MODEL, "Cannot cancel upsell photos message")
                 }
             }
             Unit
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosViewModel.kt
index 3bbefb75..3f8c1767 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PhotosViewModel.kt
@@ -26,9 +26,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.lifecycle.viewModelScope
 import androidx.paging.CombinedLoadStates
 import androidx.paging.PagingData
-import androidx.paging.cachedIn
 import androidx.paging.insertSeparators
-import androidx.paging.map
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -38,10 +36,11 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted.Companion.Eagerly
+import kotlinx.coroutines.flow.SharingStarted.Companion.WhileSubscribed
+import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
@@ -53,6 +52,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.extension.thumbnailVO
 import me.proton.android.drive.photos.domain.entity.PhotoBackupState
 import me.proton.android.drive.photos.domain.usecase.AddToAlbumInfo
@@ -92,7 +92,6 @@ import me.proton.core.drive.backup.domain.usecase.GetDisabledBackupState
 import me.proton.core.drive.backup.domain.usecase.RetryBackup
 import me.proton.core.drive.backup.domain.usecase.SyncFolders
 import me.proton.core.drive.base.data.extension.getDefaultMessage
-import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.domain.entity.FastScrollAnchor
 import me.proton.core.drive.base.domain.entity.TimestampMs
 import me.proton.core.drive.base.domain.extension.filterSuccessOrError
@@ -100,7 +99,6 @@ import me.proton.core.drive.base.domain.extension.flowOf
 import me.proton.core.drive.base.domain.extension.getOrNull
 import me.proton.core.drive.base.domain.extension.mapWithPrevious
 import me.proton.core.drive.base.domain.extension.onFailure
-import me.proton.core.drive.base.domain.log.LogTag.BACKUP
 import me.proton.core.drive.base.domain.log.LogTag.PHOTO
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.log.logId
@@ -117,9 +115,12 @@ import me.proton.core.drive.base.presentation.state.ListContentState
 import me.proton.core.drive.base.presentation.viewmodel.onLoadState
 import me.proton.core.drive.base.presentation.viewstate.TagViewState
 import me.proton.core.drive.drivelink.domain.entity.DriveLink
+import me.proton.core.drive.drivelink.photo.domain.entity.PhotoListingAnchor
+import me.proton.core.drive.drivelink.photo.domain.entity.PhotoListingsSyncState
 import me.proton.core.drive.drivelink.photo.domain.paging.PhotoDriveLinks
-import me.proton.core.drive.drivelink.photo.domain.usecase.GetPagedPhotoListingsList
 import me.proton.core.drive.drivelink.photo.domain.usecase.GetPhotoCount
+import me.proton.core.drive.drivelink.photo.domain.usecase.GetPhotoListingsPagingData
+import me.proton.core.drive.drivelink.photo.domain.usecase.PhotoListingsLoader
 import me.proton.core.drive.drivelink.selection.domain.usecase.GetSelectedDriveLinks
 import me.proton.core.drive.drivelink.selection.domain.usecase.SelectAll
 import me.proton.core.drive.feature.flag.domain.usecase.IsSpringSalePromoEnabled
@@ -148,6 +149,7 @@ import java.util.Calendar
 import java.util.Locale
 import javax.inject.Inject
 import kotlin.time.Duration.Companion.milliseconds
+import me.proton.core.drive.base.data.extension.log as logResult
 import me.proton.core.drive.base.domain.extension.combine as baseCombine
 import me.proton.core.drive.i18n.R as I18N
 import me.proton.core.presentation.R as CorePresentation
@@ -165,7 +167,7 @@ class PhotosViewModel @Inject constructor(
     removeFromAlbumInfo: RemoveFromAlbumInfo,
     getAddToAlbumPhotoListings: GetAddToAlbumPhotoListings,
     getPhotoListingCount: GetPhotoListingCount,
-    getPagedPhotoListingsList: GetPagedPhotoListingsList,
+    private val getPhotoListingsPagingData: GetPhotoListingsPagingData,
     getBackupState: GetBackupState,
     getDisabledBackupState: GetDisabledBackupState,
     getPhotoCount: GetPhotoCount,
@@ -191,6 +193,7 @@ class PhotosViewModel @Inject constructor(
     private val cancelUserMessage: CancelUserMessage,
     private val toFirstItemMetricsNotifier: ToFirstItemMetricsNotifier,
     private val isSpringSalePromoEnabled: IsSpringSalePromoEnabled,
+    private val photoListingsLoader: PhotoListingsLoader,
     val backupPermissionsViewModel: BackupPermissionsViewModel,
 ) : PhotosPickerAndSelectionViewModel(
         savedStateHandle = savedStateHandle,
@@ -272,6 +275,7 @@ class PhotosViewModel @Inject constructor(
     val initialViewState = PhotosViewState(
         title = appContext.getString(I18N.string.photos_title),
         navigationIconResId = CorePresentation.drawable.ic_proton_hamburger,
+        navigationContentDescription = appContext.getString(I18N.string.common_open_side_menu_action),
         topBarActions = topBarActions,
         listContentState = ListContentState.Loading,
         showEmptyList = null,
@@ -304,7 +308,7 @@ class PhotosViewModel @Inject constructor(
                                 contentState = listContentState,
                                 shareType = Share.Type.PHOTO,
                             )
-                            error.log(VIEW_MODEL, "Cannot get drive link")
+                            error.logResult(VIEW_MODEL, "Cannot get drive link")
                             toFirstItemMetricsNotifier.reset()
                             if (previous is DataResult.Success) {
                                 retryLoadingPhotosDriveLinkFolder()
@@ -315,28 +319,75 @@ class PhotosViewModel @Inject constructor(
         )
     }.stateIn(viewModelScope, Eagerly, null)
 
+    private fun loaderKey(tag: PhotoTag?) =
+        tag?.let { PhotoListingAnchor.tagKey(it) } ?: PhotoListingAnchor.mainKey
+
+    private val _startLoader = combine(
+        driveLink.filterNotNull(),
+        photoListingsFilter,
+    ) { link, tag ->
+        photoListingsLoader.load(
+            key = loaderKey(tag),
+            userId = userId,
+            volumeId = link.volumeId,
+            shareId = link.id.shareId,
+            tag = tag,
+        )
+    }.stateIn(viewModelScope, Eagerly, Unit)
+
+    val loaderSyncState: StateFlow<PhotoListingsSyncState> = combine(
+        driveLink.filterNotNull(),
+        photoListingsFilter,
+    ) { link, tag ->
+        photoListingsLoader.stateFor(loaderKey(tag))
+    }.flatMapLatest { it }
+        .stateIn(viewModelScope, Eagerly, PhotoListingsSyncState.Idle)
+
+    private val _loaderErrors = viewModelScope.launch {
+        loaderSyncState.collect { syncState ->
+            if (syncState is PhotoListingsSyncState.Error && listContentState.value is ListContentState.Content) {
+                _homeEffect.emit(
+                    HomeEffect.ShowSnackbar(
+                        syncState.error.getDefaultMessage(appContext, configurationProvider.useExceptionMessage)
+                    )
+                )
+            }
+        }
+    }
+
+    private val effectiveContentState: StateFlow<ListContentState> = combine(
+        listContentState,
+        loaderSyncState,
+    ) { contentState, syncState ->
+        when {
+            syncState is PhotoListingsSyncState.Loading && contentState is ListContentState.Content ->
+                contentState.copy(isRefreshing = true)
+            syncState is PhotoListingsSyncState.Loading && contentState !is ListContentState.Content ->
+                ListContentState.Loading
+            syncState is PhotoListingsSyncState.Error && contentState !is ListContentState.Content ->
+                ListContentState.Error(
+                    message = syncState.error.getDefaultMessage(appContext, configurationProvider.useExceptionMessage),
+                    actionResId = I18N.string.common_retry,
+                )
+            else -> contentState
+        }
+    }.stateIn(viewModelScope, Eagerly, ListContentState.Loading)
+
     val driveLinksMap: Flow<Map<LinkId, DriveLink>> = photoDriveLinks.getDriveLinksMapFlow(userId)
 
-    val driveLinks: Flow<PagingData<PhotosItem>> = combine(
-        parentId.filterNotNull().distinctUntilChanged(),
-        photoListingsFilter,
-    ) { _, filter ->
-        filter
-    }.transformLatest { filter ->
-        emit(PagingData.empty())
-        emitAll(getPagedPhotoListingsList(userId, filter)
-            .map { pagingData ->
-                pagingData.map { photoListing ->
-                    PhotosItem.PhotoListing(
-                        id = photoListing.linkId,
-                        captureTime = photoListing.captureTime,
-                        link = null,
-                        thumbnailVO = photoListing.thumbnailVO,
-                    )
-                }
-            }
-            .map {
-                it.insertSeparators { before: PhotosItem.PhotoListing?, after: PhotosItem.PhotoListing? ->
+    private val pagingDataCache = mutableMapOf<PhotoTag?, Flow<PagingData<PhotosItem>>>()
+
+    private fun pagingDataForTag(link: DriveLink.Folder, tag: PhotoTag?): Flow<PagingData<PhotosItem>> =
+        pagingDataCache.getOrPut(tag) {
+            getPhotoListingsPagingData(userId, link.volumeId, tag) { listing ->
+                PhotosItem.PhotoListing(
+                    id = listing.linkId,
+                    captureTime = listing.captureTime,
+                    link = null,
+                    thumbnailVO = listing.thumbnailVO,
+                )
+            }.map { pagingData ->
+                pagingData.insertSeparators { before: PhotosItem.PhotoListing?, after: PhotosItem.PhotoListing? ->
                     if (after == null) {
                         null
                     } else if (before == null) {
@@ -356,10 +407,8 @@ class PhotosViewModel @Inject constructor(
                         val afterCalendar = Calendar.getInstance().apply {
                             timeInMillis = after.captureTime.value * 1000L
                         }
-                        if (beforeCalendar.get(Calendar.YEAR)
-                            != afterCalendar.get(Calendar.YEAR) ||
-                            beforeCalendar.get(Calendar.MONTH)
-                            != afterCalendar.get(Calendar.MONTH)
+                        if (beforeCalendar.get(Calendar.YEAR) != afterCalendar.get(Calendar.YEAR) ||
+                            beforeCalendar.get(Calendar.MONTH) != afterCalendar.get(Calendar.MONTH)
                         ) {
                             val cal = Calendar.getInstance().apply {
                                 timeInMillis = after.captureTime.value * 1000L
@@ -375,9 +424,17 @@ class PhotosViewModel @Inject constructor(
                         }
                     }
                 }
-            }
-        )
-    }.cachedIn(viewModelScope)
+            }.shareIn(viewModelScope, WhileSubscribed(5_000), replay = 1)
+        }
+
+    val photoItems: Flow<PagingData<PhotosItem>> = combine(
+        driveLink.filterNotNull(),
+        photoListingsFilter,
+    ) { link, filter ->
+        link to filter
+    }.flatMapLatest { (link, filter) ->
+        pagingDataForTag(link, filter)
+    }
 
     private val listContentAppendingState = MutableStateFlow<ListContentAppendingState>(
         ListContentAppendingState.Idle
@@ -413,7 +470,7 @@ class PhotosViewModel @Inject constructor(
 
     val viewState: Flow<PhotosViewState> = baseCombine(
         selected,
-        listContentState,
+        effectiveContentState,
         backupState,
         getPhotoCount(userId = userId),
         firstVisibleItemIndex,
@@ -476,6 +533,11 @@ class PhotosViewModel @Inject constructor(
             } else {
                 CorePresentation.drawable.ic_proton_cross
             },
+            navigationContentDescription = if (showHamburgerMenuIcon) {
+                appContext.getString(I18N.string.common_open_side_menu_action)
+            } else {
+                appContext.getString(I18N.string.common_close_action)
+            },
             notificationDotVisible = showHamburgerMenuIcon && notificationDotRequested,
             inMultiselect = selected.isNotEmpty() || inPickerMode,
             isFastScrollEnabled = isFastScrollEnabled,
@@ -660,7 +722,7 @@ class PhotosViewModel @Inject constructor(
             enablePhotosBackup(folderId).onSuccess { state ->
                 onPhotoBackupState(state)
             }.onFailure { error ->
-                error.log(BACKUP, "Cannot enable backup for folder: ${folderId.id}")
+                error.log(VIEW_MODEL, "Cannot enable backup for folder: ${folderId.id}")
                 broadcastMessages(
                     userId = userId,
                     message = error.getDefaultMessage(
@@ -702,7 +764,7 @@ class PhotosViewModel @Inject constructor(
         viewModelScope.launch {
             (parentId.value as? FolderId)?.let { folderId ->
                 retryBackup(folderId).onFailure { error ->
-                    error.log(BACKUP, "Cannot retry on backup")
+                    error.log(VIEW_MODEL, "Cannot retry on backup")
                     broadcastMessages(
                         userId = userId,
                         message = error.getDefaultMessage(
@@ -719,7 +781,7 @@ class PhotosViewModel @Inject constructor(
     private fun dismissBackgroundRestrictions() {
         viewModelScope.launch {
             cancelUserMessage(userId, UserMessage.BACKUP_BATTERY_SETTINGS).onFailure { error ->
-                error.log(BACKUP, "Cannot dismiss battery settings warning")
+                error.log(VIEW_MODEL, "Cannot dismiss battery settings warning")
             }
         }
     }
@@ -734,7 +796,16 @@ class PhotosViewModel @Inject constructor(
             if (driveLink.value == null) {
                 retryLoadingPhotosDriveLinkFolder()
             } else {
-                retryList()
+                driveLink.value?.let { link ->
+                    val tag = photoListingsFilter.value
+                    photoListingsLoader.retry(
+                        key = loaderKey(tag),
+                        userId = userId,
+                        volumeId = link.volumeId,
+                        shareId = link.id.shareId,
+                        tag = tag,
+                    )
+                }
             }
         }
     }
@@ -744,10 +815,6 @@ class PhotosViewModel @Inject constructor(
         listContentState.value = ListContentState.Loading
     }
 
-    private suspend fun retryList() {
-        _listEffect.emit(ListEffect.RETRY)
-    }
-
     private fun onRefresh() {
         viewModelScope.launch {
             (parentId.value as? FolderId)?.let { folderId ->
@@ -758,6 +825,16 @@ class PhotosViewModel @Inject constructor(
                     error.log(VIEW_MODEL, "Failed sync folder on manual refresh")
                 }
             }
+            driveLink.value?.let { link ->
+                val tag = photoListingsFilter.value
+                photoListingsLoader.refresh(
+                    key = loaderKey(tag),
+                    userId = userId,
+                    volumeId = link.volumeId,
+                    shareId = link.id.shareId,
+                    tag = tag,
+                )
+            }
             _listEffect.emit(ListEffect.REFRESH)
         }
     }
@@ -792,7 +869,10 @@ class PhotosViewModel @Inject constructor(
         isFastScrollEnabled.value = isFastScrollThresholdReached(items.size, anchors, anchorsInLabel)
     }
 
-    private val fastScrollAnchors: MutableMap<Pair<Int, Int>, List<FastScrollAnchor>> = mutableMapOf()
+    private val fastScrollAnchors: MutableMap<Pair<Int, Int>, List<FastScrollAnchor>> =
+        object : LinkedHashMap<Pair<Int, Int>, List<FastScrollAnchor>>() {
+            override fun removeEldestEntry(eldest: MutableMap.MutableEntry<Pair<Int, Int>, List<FastScrollAnchor>>) = size > 1
+        }
 
     private val List<PhotosItem>.itemsHash get() = this.fold(1) { acc, item ->
         31 * acc + item.hashCode()
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PreviewViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PreviewViewModel.kt
index 68ca868d..705996ab 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PreviewViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/PreviewViewModel.kt
@@ -74,6 +74,7 @@ import me.proton.core.drive.base.domain.entity.TimestampS
 import me.proton.core.drive.base.domain.entity.toFileTypeCategory
 import me.proton.core.drive.base.domain.extension.bytes
 import me.proton.core.drive.base.domain.extension.filterSuccessOrError
+import me.proton.core.drive.base.domain.extension.getOrNull
 import me.proton.core.drive.base.domain.function.pagedList
 import me.proton.core.drive.base.domain.log.LogTag
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
@@ -258,6 +259,7 @@ class PreviewViewModel @Inject constructor(
     private val renderFailed = MutableStateFlow<Pair<Throwable, Any>?>(null)
     val initialViewState = PreviewViewState(
         navigationIconResId = CorePresentation.drawable.ic_arrow_back,
+        navigationContentDescription = appContext.getString(I18N.string.common_back_action),
         isFullscreen = isFullscreen,
         previewContentState = PreviewContentState.Loading,
         items = emptyList(),
@@ -547,7 +549,7 @@ class PreviewViewModel @Inject constructor(
                 viewModelScope.launch {
                     openProtonDocumentInBrowser(driveLink)
                         .onFailure { error ->
-                            error.log(LogTag.DEFAULT, "Open document failed")
+                            error.log(VIEW_MODEL, "Open document failed")
                             val message = when {
                                 error is ActivityNotFoundException -> appContext.getString(I18N.string.common_error_no_browser_available)
                                 else -> error.getDefaultMessage(
@@ -651,9 +653,9 @@ class FolderContentProvider(
                             .distinctUntilChanged()
                             .mapLatest {
                                 getDecryptedDriveLinks(folderId)
-                                    .getOrNull()
+                                    .getOrNull(LogTag.DEFAULT, "Cannot decrypt drive links for ${folderId.id}")
                                     ?.filterIsInstance<DriveLink.File>()
-                                    ?: emptyList<DriveLink.File>()
+                                    ?: emptyList()
                             }
                     )
                 } ?: emit(emptyList())
@@ -726,9 +728,9 @@ class OfflineContentProvider(
             .distinctUntilChanged()
             .mapLatest {
                 getDecryptedOfflineDriveLinks(userId)
-                    .getOrNull()
+                    .getOrNull(LogTag.DEFAULT, "Cannot decrypt offline drive links")
                     ?.filterIsInstance<DriveLink.File>()
-                    ?: emptyList<DriveLink.File>()
+                    ?: emptyList()
             }
             .stateIn(coroutineScope, SharingStarted.Eagerly, emptyList())
 
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ScanDocumentNameViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ScanDocumentNameViewModel.kt
index 9fad0974..be4da751 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ScanDocumentNameViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ScanDocumentNameViewModel.kt
@@ -46,7 +46,6 @@ import me.proton.android.drive.extension.getDefaultMessage
 import me.proton.android.drive.extension.log
 import me.proton.core.drive.base.domain.entity.TimestampMs
 import me.proton.core.drive.base.domain.extension.bytes
-import me.proton.core.drive.base.domain.extension.getOrNull
 import me.proton.core.drive.base.domain.extension.toResult
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
@@ -189,20 +188,18 @@ class ScanDocumentNameViewModel @Inject constructor(
                     error.showOnDoneError()
                     return@launch
                 }
-            removeScanResult(userId, scanResult.id).getOrNull(
-                tag = VIEW_MODEL,
-                message = "Failed to remove scan result"
-            )
+            removeScanResult(userId, scanResult.id).onFailure { error ->
+                error.log(VIEW_MODEL, "Failed to remove scan result")
+            }
             navigateBack()
         }
     }
 
     private fun onCancel(navigateBack: () -> Unit) {
         viewModelScope.launch {
-            clearScanResult(userId, scanResultId).getOrNull(
-                tag = VIEW_MODEL,
-                message = "Failed clearing scan result $scanResultId",
-            )
+            clearScanResult(userId, scanResultId).onFailure { error ->
+                error.log(VIEW_MODEL, "Failed clearing scan result $scanResultId")
+            }
             navigateBack()
         }
     }
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SelectionViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SelectionViewModel.kt
index 203dc99d..d211c3c5 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SelectionViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SelectionViewModel.kt
@@ -34,6 +34,8 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.presentation.common.Action
 import me.proton.core.drive.base.presentation.viewmodel.UserViewModel
 import me.proton.core.drive.drivelink.domain.entity.DriveLink
@@ -99,7 +101,9 @@ open class SelectionViewModel(
         super.onCleared()
         selectionId.value?.let { selectionId ->
             CoroutineScope(Dispatchers.Main).launch {
-                deselectLinks(selectionId)
+                deselectLinks(selectionId).onFailure { error ->
+                    error.log(VIEW_MODEL, "Failed to deselect links")
+                }
             }
         }
     }
@@ -113,7 +117,13 @@ open class SelectionViewModel(
     protected open fun onTopAppBarNavigation(nonSelectedBlock: () -> Unit): () -> Unit = {
         Unit.also {
             if (selected.value.isNotEmpty()) {
-                selectionId.value?.let { viewModelScope.launch { deselectLinks(it) } }
+                selectionId.value?.let { selectionId ->
+                    viewModelScope.launch {
+                        deselectLinks(selectionId).onFailure { error ->
+                            error.log(VIEW_MODEL, "Failed to deselect links")
+                        }
+                    }
+                }
             } else {
                 nonSelectedBlock()
             }
@@ -152,16 +162,25 @@ open class SelectionViewModel(
 
     protected open fun addSelected(linkIds: List<LinkId>) {
         viewModelScope.launch {
-            selectionId.value?.let { selectionId ->
-                selectLinks(selectionId, linkIds)
-            } ?: setSelectionId(selectLinks(linkIds).getOrNull())
+            val id = selectionId.value
+            if (id != null) {
+                selectLinks(id, linkIds).onFailure { error ->
+                    error.log(VIEW_MODEL, "Failed to select links")
+                }
+            } else {
+                setSelectionId(selectLinks(linkIds).onFailure { error ->
+                    error.log(VIEW_MODEL, "Failed to select links")
+                }.getOrNull())
+            }
         }
     }
 
     protected open fun removeSelected(linkIds: List<LinkId>) {
         viewModelScope.launch {
             selectionId.value?.let { selectionId ->
-                deselectLinks(selectionId, linkIds)
+                deselectLinks(selectionId, linkIds).onFailure { error ->
+                    error.log(VIEW_MODEL, "Failed to deselect links")
+                }
             }
         }
     }
@@ -169,7 +188,11 @@ open class SelectionViewModel(
     protected fun removeAllSelected() {
         if (selected.value.isNotEmpty()) {
             viewModelScope.launch {
-                selectionId.value?.let { selectionId -> deselectLinks(selectionId) }
+                selectionId.value?.let { selectionId ->
+                    deselectLinks(selectionId).onFailure { error ->
+                        error.log(VIEW_MODEL, "Failed to deselect links")
+                    }
+                }
             }
         }
     }
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SendFileViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SendFileViewModel.kt
index 609db97c..da5f46c1 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SendFileViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SendFileViewModel.kt
@@ -39,10 +39,10 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.take
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.navigation.Screen
 import me.proton.core.domain.arch.DataResult
 import me.proton.core.domain.arch.mapSuccessValueOrNull
-import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.domain.entity.Percentage
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SettingsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SettingsViewModel.kt
index 1d6d10d9..0db0eb4b 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SettingsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SettingsViewModel.kt
@@ -183,6 +183,7 @@ class SettingsViewModel @Inject constructor(
     ) {  debugSettings, themeStyle, enabled, autoLockDuration, isBackupEnabled, dynamicHomeTab, userLogKillSwitch ->
         SettingsViewState(
             navigationIcon = CorePresentation.drawable.ic_arrow_back,
+            navigationContentDescription = context.getString(I18N.string.common_back_action),
             appNameResId = I18N.string.app_name,
             appVersion = BuildConfig.VERSION_NAME,
             legalLinks = listOf(
@@ -225,7 +226,12 @@ class SettingsViewModel @Inject constructor(
         },
         onThemeStyleChanged = { newStyle ->
             viewModelScope.launch {
-                updateThemeStyle(userId, enumValues<ThemeStyle>().first { style -> style.resId == newStyle })
+                updateThemeStyle(
+                    userId = userId,
+                    themeStyle = enumValues<ThemeStyle>().first { style -> style.resId == newStyle }
+                ).onFailure { error ->
+                    error.log(VIEW_MODEL, "Failed to update theme style")
+                }
             }
         },
         onAccountSettings = {
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareInvitationOptionsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareInvitationOptionsViewModel.kt
index 401fdf1b..f3ce5643 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareInvitationOptionsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareInvitationOptionsViewModel.kt
@@ -32,9 +32,9 @@ import me.proton.core.compose.component.bottomsheet.RunAction
 import me.proton.core.domain.arch.DataResult
 import me.proton.core.domain.arch.mapSuccessValueOrNull
 import me.proton.core.drive.base.data.extension.getDefaultMessage
-import me.proton.core.drive.base.data.extension.log
+import me.proton.core.drive.base.data.extension.log as logResult
 import me.proton.core.drive.base.domain.entity.Permissions
-import me.proton.core.drive.base.domain.log.LogTag.SHARING
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.extension.require
@@ -130,7 +130,7 @@ abstract class ShareInvitationOptionsViewModel(
         error: DataResult.Error,
         type: BroadcastMessage.Type = BroadcastMessage.Type.WARNING
     ) {
-        error.log(SHARING)
+        error.logResult(VIEW_MODEL)
         broadcastMessages(
             userId = userId,
             message = error.getDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareLinkPermissionsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareLinkPermissionsViewModel.kt
index 5f1cda2c..6d254f65 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareLinkPermissionsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareLinkPermissionsViewModel.kt
@@ -31,13 +31,13 @@ import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.options.ShareLinkPermissionsOption
 import me.proton.core.compose.component.bottomsheet.RunAction
 import me.proton.core.domain.arch.mapSuccessValueOrNull
 import me.proton.core.drive.base.data.extension.getDefaultMessage
-import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.domain.entity.Permissions
-import me.proton.core.drive.base.domain.log.LogTag.SHARING
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.extension.require
@@ -112,7 +112,7 @@ class ShareLinkPermissionsViewModel @Inject constructor(
             permissions = permissions,
         ).onFailure { error ->
             error.log(
-                SHARING,
+                VIEW_MODEL,
                 "Cannot update permissions for ${sharedDriveLink.shareUrlId.id}"
             )
             broadcastMessages(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareMemberOptionsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareMemberOptionsViewModel.kt
index 90d4d05e..6e50a06c 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareMemberOptionsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareMemberOptionsViewModel.kt
@@ -33,15 +33,16 @@ import kotlinx.coroutines.flow.last
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.options.MemberOption
 import me.proton.core.compose.component.bottomsheet.RunAction
 import me.proton.core.domain.arch.mapSuccessValueOrNull
 import me.proton.core.drive.base.data.extension.getDefaultMessage
-import me.proton.core.drive.base.data.extension.log
+import me.proton.core.drive.base.data.extension.log as logResult
 import me.proton.core.drive.base.domain.entity.Permissions
 import me.proton.core.drive.base.domain.extension.filterSuccessOrError
 import me.proton.core.drive.base.domain.extension.onFailure
-import me.proton.core.drive.base.domain.log.LogTag.SHARING
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.extension.require
@@ -145,7 +146,7 @@ class ShareMemberOptionsViewModel @Inject constructor(
         ).filterSuccessOrError()
             .last()
         dataResult.onFailure { error ->
-            error.log(SHARING)
+            error.logResult(VIEW_MODEL, "Failed to update member permissions for $memberId")
             broadcastMessages(
                 userId = userId,
                 message = error.getDefaultMessage(
@@ -163,7 +164,7 @@ class ShareMemberOptionsViewModel @Inject constructor(
             memberId = memberId,
         ).filterSuccessOrError().last()
         dataResult.onFailure { error ->
-            error.log(SHARING)
+            error.logResult(VIEW_MODEL, "Failed to delete member for $memberId")
             broadcastMessages(
                 userId = userId,
                 message = error.getDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareMultiplePhotosOptionsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareMultiplePhotosOptionsViewModel.kt
index 30e76b25..70037821 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareMultiplePhotosOptionsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/ShareMultiplePhotosOptionsViewModel.kt
@@ -24,11 +24,13 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.photos.domain.usecase.AddPhotosToAlbum
 import me.proton.android.drive.photos.domain.usecase.AddToAlbumInfo
 import me.proton.android.drive.ui.viewevent.ShareMultiplePhotosOptionsViewEvent
 import me.proton.android.drive.ui.viewstate.ShareMultiplePhotosOptionsViewState
 import me.proton.core.domain.arch.DataResult
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.presentation.component.RunAction
@@ -117,7 +119,9 @@ class ShareMultiplePhotosOptionsViewModel @Inject constructor(
     }
 
     override suspend fun onSuccessfullyAdded(photoListings: List<PhotoListing.Volume>) {
-        deselectLinks(selectionId)
+        deselectLinks(selectionId).onFailure { error ->
+            error.log(VIEW_MODEL, "Failed to deselect links")
+        }
     }
 
     override fun getAlbumDetails(album: DriveLink.Album?): String? = album.details()
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SharedTabsViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SharedTabsViewModel.kt
index 3f8c74e9..a525fb27 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SharedTabsViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SharedTabsViewModel.kt
@@ -18,16 +18,17 @@
 
 package me.proton.android.drive.ui.viewmodel
 
+import android.content.Context
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import me.proton.android.drive.ui.effect.HomeEffect
 import me.proton.android.drive.ui.effect.HomeTabViewModel
@@ -42,6 +43,7 @@ import me.proton.core.drive.i18n.R as I18N
 
 @HiltViewModel
 class SharedTabsViewModel @Inject constructor(
+    @param:ApplicationContext private val appContext: Context,
     savedStateHandle: SavedStateHandle,
     shouldUpgradeStorage: ShouldUpgradeStorage,
 ) : ViewModel(),
@@ -58,6 +60,7 @@ class SharedTabsViewModel @Inject constructor(
     val initialViewState = SharedTabsViewState(
         titleResId = I18N.string.title_shared,
         navigationIconResId = CorePresentation.drawable.ic_proton_hamburger,
+        navigationContentDescription = appContext.getString(I18N.string.common_open_side_menu_action),
         notificationDotVisible = false,
         tabs = listOf(sharedWithMeTab, sharedWithByTab),
         selectedTab = selectedTab.value,
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SortingDialogViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SortingDialogViewModel.kt
index b51a6b87..236c6260 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SortingDialogViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SortingDialogViewModel.kt
@@ -23,7 +23,9 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.navigation.Screen
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.presentation.extension.require
 import me.proton.core.drive.base.presentation.viewmodel.UserViewModel
 import me.proton.core.drive.sorting.domain.entity.Sorting
@@ -43,7 +45,9 @@ class SortingDialogViewModel @Inject constructor(
 
     suspend fun setSorting(sorting: Sorting) {
         viewModelScope.launch {
-            updateSorting(userId, sorting)
+            updateSorting(userId, sorting).onFailure { error ->
+                error.log(VIEW_MODEL, "Failed update sorting")
+            }
         }.join()
     }
 }
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SubscriptionPromoViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SubscriptionPromoViewModel.kt
index c2dd72a4..3612b301 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SubscriptionPromoViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SubscriptionPromoViewModel.kt
@@ -27,12 +27,12 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import me.proton.android.drive.R
-import me.proton.android.drive.log.DriveLogTag.DEFAULT
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.viewevent.DriveLitePopupViewEvent
 import me.proton.android.drive.ui.viewstate.SubscriptionPromoViewState
 import me.proton.android.drive.usecase.MarkSubscriptionPromoAsShown
-import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.domain.extension.GiB
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.presentation.component.RunAction
 import me.proton.core.drive.base.presentation.extension.asHumanReadableString
 import me.proton.core.drive.base.presentation.extension.require
@@ -151,7 +151,7 @@ class SubscriptionPromoViewModel @Inject constructor(
         override val onDismiss = {
             viewModelScope.launch {
                 markSubscriptionPromoAsShown(userId, key).onFailure { error ->
-                    error.log(DEFAULT, "Cannot mark subscription promo as shown")
+                    error.log(VIEW_MODEL, "Cannot mark subscription promo as shown")
                 }
             }
             Unit
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SyncedFoldersViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SyncedFoldersViewModel.kt
index a9617c60..ed09810e 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SyncedFoldersViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/SyncedFoldersViewModel.kt
@@ -45,6 +45,7 @@ import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.common.onClick
 import me.proton.android.drive.ui.effect.HomeEffect
 import me.proton.android.drive.ui.effect.HomeTabViewModel
@@ -57,18 +58,18 @@ import me.proton.core.drive.base.domain.extension.onFailure
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.presentation.common.getThemeDrawableId
+import me.proton.core.drive.base.presentation.effect.ListEffect
+import me.proton.core.drive.base.presentation.state.ListContentAppendingState
+import me.proton.core.drive.base.presentation.state.ListContentState
 import me.proton.core.drive.base.presentation.viewmodel.UserViewModel
+import me.proton.core.drive.base.presentation.viewmodel.onLoadState
 import me.proton.core.drive.drivelink.crypto.domain.usecase.GetDecryptedDriveLink
 import me.proton.core.drive.drivelink.domain.entity.DriveLink
 import me.proton.core.drive.drivelink.domain.extension.isNameEncrypted
 import me.proton.core.drive.drivelink.list.domain.usecase.GetPagedDriveLinksList
+import me.proton.core.drive.files.domain.usecase.ToFirstItemMetricsNotifier
 import me.proton.core.drive.files.presentation.event.FilesViewEvent
 import me.proton.core.drive.files.presentation.state.FilesViewState
-import me.proton.core.drive.base.presentation.state.ListContentAppendingState
-import me.proton.core.drive.base.presentation.state.ListContentState
-import me.proton.core.drive.base.presentation.effect.ListEffect
-import me.proton.core.drive.base.presentation.viewmodel.onLoadState
-import me.proton.core.drive.files.domain.usecase.ToFirstItemMetricsNotifier
 import me.proton.core.drive.i18n.R
 import me.proton.core.drive.link.domain.entity.FolderId
 import me.proton.core.drive.link.domain.extension.userId
@@ -76,7 +77,6 @@ import me.proton.core.drive.observability.domain.metrics.common.mobile.performan
 import me.proton.core.drive.share.domain.entity.ShareId
 import me.proton.core.drive.sorting.domain.entity.Sorting
 import me.proton.core.drive.sorting.domain.usecase.GetSorting
-import me.proton.core.util.kotlin.CoreLogger
 import me.proton.drive.android.settings.domain.entity.LayoutType
 import me.proton.drive.android.settings.domain.usecase.GetLayoutType
 import me.proton.drive.android.settings.domain.usecase.ToggleLayoutType
@@ -114,6 +114,7 @@ class SyncedFoldersViewModel @Inject constructor(
         title = folderName,
         titleResId = R.string.title_offline_available,
         navigationIconResId = me.proton.core.presentation.R.drawable.ic_arrow_back,
+        navigationContentDescription = appContext.getString(I18N.string.common_back_action),
         drawerGesturesEnabled = true,
         sorting = Sorting.DEFAULT,
         listContentState = listContentState.value,
@@ -254,7 +255,14 @@ class SyncedFoldersViewModel @Inject constructor(
     }
 
     private fun onToggleLayout() {
-        viewModelScope.launch { toggleLayoutType(userId = userId, currentLayoutType = layoutType.value) }
+        viewModelScope.launch {
+            toggleLayoutType(
+                userId = userId,
+                currentLayoutType = layoutType.value,
+            ).onFailure { error ->
+                error.log(VIEW_MODEL, "Failed to toggle layout type $layoutType")
+            }
+        }
     }
 
     private fun retryList() {
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/TrashViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/TrashViewModel.kt
index 906afd7a..7a100412 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/TrashViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/TrashViewModel.kt
@@ -41,12 +41,14 @@ import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.ui.effect.TrashEffect
 import me.proton.android.drive.ui.navigation.Screen
 import me.proton.android.drive.ui.screen.EmptyTrashIconState
 import me.proton.core.domain.arch.mapSuccessValueOrNull
 import me.proton.core.drive.base.domain.entity.TimestampMs
 import me.proton.core.drive.base.domain.extension.flowOf
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.presentation.common.getThemeDrawableId
 import me.proton.core.drive.base.presentation.effect.ListEffect
@@ -112,6 +114,7 @@ class TrashViewModel @Inject constructor(
         titleResId = I18N.string.common_trash,
         sorting = Sorting.DEFAULT,
         navigationIconResId = CorePresentation.drawable.ic_arrow_back,
+        navigationContentDescription = appContext.getString(I18N.string.common_back_action),
         drawerGesturesEnabled = true,
         listContentState = listContentState.value,
         listContentAppendingState = listContentAppendingState.value,
@@ -247,6 +250,13 @@ class TrashViewModel @Inject constructor(
     }
 
     private fun onToggleLayout() {
-        viewModelScope.launch { toggleLayoutType(userId = userId, currentLayoutType = layoutType.value) }
+        viewModelScope.launch {
+            toggleLayoutType(
+                userId = userId,
+                currentLayoutType = layoutType.value,
+            ).onFailure { error ->
+                error.log(VIEW_MODEL, "Failed to toggle layout $layoutType")
+            }
+        }
     }
 }
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/UploadToViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/UploadToViewModel.kt
index ef8bda09..dc56fa1e 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/UploadToViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/UploadToViewModel.kt
@@ -41,7 +41,7 @@ import me.proton.android.drive.ui.navigation.UploadParameters
 import me.proton.android.drive.ui.viewevent.UploadToViewEvent
 import me.proton.android.drive.ui.viewstate.UploadToViewState
 import me.proton.core.domain.arch.mapSuccessValueOrNull
-import me.proton.core.drive.base.domain.log.LogTag
+import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.drivelink.crypto.domain.usecase.GetDecryptedDriveLink
@@ -97,6 +97,7 @@ class UploadToViewModel @Inject constructor(
         filesViewState = initialFilesViewState,
         title = "",
         navigationIconResId = CorePresentation.drawable.ic_proton_cross,
+        navigationContentDescription = appContext.getString(I18N.string.common_close_action),
         fileNames = uploadParameters?.uris?.map { uri -> uri.fileName } ?: emptyList(),
     )
     val driveLink: StateFlow<DriveLink.Folder?> = getDriveLink(userId, folderId = null)
@@ -122,6 +123,11 @@ class UploadToViewModel @Inject constructor(
             } else {
                 CorePresentation.drawable.ic_arrow_back
             },
+            navigationContentDescription = if (parentLink == null || isRoot) {
+                appContext.getString(I18N.string.common_close_action)
+            } else {
+                appContext.getString(I18N.string.common_back_action)
+            },
         )
     }.shareIn(viewModelScope, SharingStarted.Eagerly, replay = 1)
 
@@ -176,7 +182,7 @@ class UploadToViewModel @Inject constructor(
                     exitApp()
                 }
             }.onFailure { error ->
-                error.log(LogTag.UPLOAD, "Failed to upload ${copiedUris.size} files")
+                error.log(VIEW_MODEL, "Failed to upload ${copiedUris.size} files")
                 cleanupOnFailure(copiedUris)
                 when (error) {
                     is NotEnoughSpaceException -> navigateToStorageFull()
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/UserInvitationViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/UserInvitationViewModel.kt
index c58af5aa..cdc26892 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/UserInvitationViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/UserInvitationViewModel.kt
@@ -33,14 +33,14 @@ import kotlinx.coroutines.flow.last
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transform
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.core.domain.arch.DataResult
 import me.proton.core.domain.arch.onSuccess
 import me.proton.core.drive.base.data.extension.getDefaultMessage
-import me.proton.core.drive.base.data.extension.log
+import me.proton.core.drive.base.data.extension.log as logResult
 import me.proton.core.drive.base.data.extension.logDefaultMessage
 import me.proton.core.drive.base.domain.extension.filterSuccessOrError
 import me.proton.core.drive.base.domain.extension.onFailure
-import me.proton.core.drive.base.domain.log.LogTag.SHARING
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
@@ -94,7 +94,7 @@ class UserInvitationViewModel @Inject constructor(
             when (result) {
                 is DataResult.Processing -> listContentState.value = ListContentState.Loading
                 is DataResult.Error -> {
-                    result.log(VIEW_MODEL)
+                    result.logResult(VIEW_MODEL)
                     listContentState.value = ListContentState.Error(result.logDefaultMessage(
                         context = appContext,
                         useExceptionMessage = configurationProvider.useExceptionMessage,
@@ -124,6 +124,7 @@ class UserInvitationViewModel @Inject constructor(
             }
         ).format(0),
         navigationIconResId = CorePresentation.drawable.ic_proton_arrow_back,
+        navigationContentDescription = appContext.getString(I18N.string.common_back_action),
         listContentState = listContentState.value,
     )
 
@@ -155,7 +156,7 @@ class UserInvitationViewModel @Inject constructor(
             acceptUserInvitation(invitationId).filterSuccessOrError()
                 .last()
                 .onFailure { error ->
-                    error.log(SHARING, "Cannot accept invitation: $invitationId")
+                    error.logResult(VIEW_MODEL, "Cannot accept invitation: $invitationId")
                     broadcastMessages(
                         userId,
                         error.getDefaultMessage(
@@ -185,7 +186,7 @@ class UserInvitationViewModel @Inject constructor(
                 .filterSuccessOrError()
                 .last()
                 .onFailure { error ->
-                    error.log(SHARING, "Cannot delete invitation: $invitationId")
+                    error.logResult(VIEW_MODEL, "Cannot delete invitation: $invitationId")
                     broadcastMessages(
                         userId,
                         error.getDefaultMessage(
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/WhatsNewViewModel.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/WhatsNewViewModel.kt
index 1d019cb4..b41e111d 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/WhatsNewViewModel.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewmodel/WhatsNewViewModel.kt
@@ -26,9 +26,9 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
+import me.proton.android.drive.extension.log
 import me.proton.android.drive.usecase.MarkWhatsNewAsShown
 import me.proton.core.drive.base.domain.extension.flowOf
-import me.proton.core.drive.base.domain.extension.getOrNull
 import me.proton.core.drive.base.domain.log.LogTag.VIEW_MODEL
 import me.proton.core.drive.base.presentation.common.getThemeDrawableId
 import me.proton.core.drive.base.presentation.viewevent.WhatsNewViewEvent
@@ -69,8 +69,9 @@ class WhatsNewViewModel @Inject constructor(
 
     private fun whatsNewShown() {
         viewModelScope.launch {
-            markWhatsNewAsShown(key)
-                .getOrNull(VIEW_MODEL, "Marking whats new as shown failed for: $key")
+            markWhatsNewAsShown(key).onFailure { error ->
+                error.log(VIEW_MODEL, "Marking whats new as shown failed for: $key")
+            }
         }
     }
 
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/ComputersViewState.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/ComputersViewState.kt
index 6463b701..b2a727e5 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/ComputersViewState.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/ComputersViewState.kt
@@ -24,6 +24,7 @@ import me.proton.core.drive.base.presentation.state.ListContentState
 data class ComputersViewState(
     val title: String,
     @DrawableRes val navigationIconResId: Int,
+    val navigationContentDescription: String?,
     val notificationDotVisible: Boolean,
     val listContentState: ListContentState,
     val isRefreshEnabled: Boolean,
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/MoveFileViewState.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/MoveFileViewState.kt
index ba038e2a..a933b7e4 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/MoveFileViewState.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/MoveFileViewState.kt
@@ -29,6 +29,7 @@ data class MoveFileViewState(
     val title: String,
     val isTitleEncrypted: Boolean = false,
     val navigationIconResId: Int = 0,
+    val navigationContentDescription: String? = null,
     val driveLinks: List<String> = emptyList(),
     val topBarActions: Flow<Set<Action>> = emptyFlow(),
 )
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/SharedTabsViewState.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/SharedTabsViewState.kt
index 7d749c4a..d14d1642 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/SharedTabsViewState.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/SharedTabsViewState.kt
@@ -24,6 +24,7 @@ import androidx.annotation.StringRes
 data class SharedTabsViewState(
     @StringRes val titleResId: Int,
     @DrawableRes val navigationIconResId: Int,
+    val navigationContentDescription: String?,
     val notificationDotVisible: Boolean,
     val tabs: List<SharedTab>,
     val selectedTab: SharedTab,
diff --git a/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/UploadToViewState.kt b/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/UploadToViewState.kt
index 63bb6765..392b04a6 100644
--- a/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/UploadToViewState.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/ui/viewstate/UploadToViewState.kt
@@ -28,5 +28,6 @@ data class UploadToViewState(
     val isTitleEncrypted: Boolean = false,
     val isBackHandlerEnabled: Boolean = false,
     val navigationIconResId: Int = 0,
+    val navigationContentDescription: String? = null,
     val fileNames: List<String> = emptyList(),
 )
diff --git a/app/src/main/kotlin/me/proton/android/drive/usecase/HandleUncaughtException.kt b/app/src/main/kotlin/me/proton/android/drive/usecase/HandleUncaughtException.kt
index f0cc6520..d4e585e6 100644
--- a/app/src/main/kotlin/me/proton/android/drive/usecase/HandleUncaughtException.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/usecase/HandleUncaughtException.kt
@@ -27,7 +27,6 @@ import me.proton.core.drive.announce.event.domain.usecase.AnnounceEvent
 import me.proton.core.drive.base.domain.usecase.ClearCacheFolder
 import me.proton.core.drive.base.domain.usecase.GetInternalStorageInfo
 import me.proton.core.drive.base.domain.util.coRunCatching
-import me.proton.core.drive.photo.data.db.PhotoDatabase
 import me.proton.core.util.kotlin.CoreLogger
 import java.io.IOException
 import javax.inject.Inject
@@ -36,7 +35,6 @@ class HandleUncaughtException @Inject constructor(
     private val getInternalStorageInfo: GetInternalStorageInfo,
     private val clearCacheFolder: ClearCacheFolder,
     private val announceEvent: AnnounceEvent,
-    private val db: PhotoDatabase,
 ) {
 
     operator fun invoke(error: Throwable, isFromMainThread: Boolean): Result<Boolean> = coRunCatching {
@@ -46,28 +44,7 @@ class HandleUncaughtException @Inject constructor(
             clearCacheFolder()
         }
         val isCursorWindowError = error.isCursorWindowError
-        val hasGetPhotoListingsDescFlowString = error.stackTraceToString().contains("getPhotoListingsDescFlow")
-        CoreLogger.d(DriveLogTag.CRASH, "HandleUncaughtException isCursorWindowError=$isCursorWindowError, hasGetPhotoListingsDescFlowString=$hasGetPhotoListingsDescFlowString, isFromMainThread=$isFromMainThread")
-        if (error is java.lang.IllegalStateException ||
-            error.cause is java.lang.IllegalStateException
-        ) {
-            val invalidCaptureTimes = runBlocking {
-                db.photoListingDao.getInvalidCaptureTimes()
-            }
-            val message = if (invalidCaptureTimes.isNotEmpty()) {
-                buildString {
-                    append("Invalid capture time found: ")
-                    append(
-                        invalidCaptureTimes.joinToString { (captureTime, type) ->
-                            "(captureTime=$captureTime type=$type)"
-                        }
-                    )
-                }
-            } else {
-                "No invalid capture times found in PhotoListingEntity"
-            }
-            CoreLogger.d(DriveLogTag.CRASH, message)
-        }
+        CoreLogger.d(DriveLogTag.CRASH, "HandleUncaughtException isCursorWindowError=$isCursorWindowError, isFromMainThread=$isFromMainThread")
         when (error) {
             is IOException,
             is SQLiteDiskIOException,
diff --git a/app/src/main/kotlin/me/proton/android/drive/usecase/ShowRatingBooster.kt b/app/src/main/kotlin/me/proton/android/drive/usecase/ShowRatingBooster.kt
index 4e89da82..242d02c0 100644
--- a/app/src/main/kotlin/me/proton/android/drive/usecase/ShowRatingBooster.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/usecase/ShowRatingBooster.kt
@@ -26,10 +26,8 @@ import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import me.proton.android.drive.log.DriveLogTag.UI
 import me.proton.core.accountmanager.domain.AccountManager
-import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.base.data.entity.LoggerLevel.WARNING
 import me.proton.core.drive.base.data.extension.log
-import me.proton.core.drive.base.domain.extension.getOrNull
 import me.proton.core.util.kotlin.CoreLogger
 import javax.inject.Inject
 
@@ -48,8 +46,9 @@ class ShowRatingBooster @Inject constructor(
                             if (task.isSuccessful) {
                                 CoroutineScope(Dispatchers.Main).launch {
                                     accountManager.getPrimaryUserId().firstOrNull()?.let { userId ->
-                                        markRatingBoosterAsShown(userId = userId)
-                                            .getOrNull(UI, "Marking rating booster as shown failed")
+                                        markRatingBoosterAsShown(userId = userId).onFailure { error ->
+                                            error.log(UI, "Marking rating booster as shown failed")
+                                        }
                                     } ?: {
                                         CoreLogger.w(UI, "User Id is null, please investigate")
                                     }()
diff --git a/app/src/main/kotlin/me/proton/android/drive/usecase/notification/AcceptNotificationEvent.kt b/app/src/main/kotlin/me/proton/android/drive/usecase/notification/AcceptNotificationEvent.kt
index 777fdce9..0c2a8040 100644
--- a/app/src/main/kotlin/me/proton/android/drive/usecase/notification/AcceptNotificationEvent.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/usecase/notification/AcceptNotificationEvent.kt
@@ -35,6 +35,7 @@ class AcceptNotificationEvent @Inject constructor(
                     && (newEvent.state == UploadState.NEW_UPLOAD || newEvent.exists(notificationId))
 
             is Event.Download -> true
+            is Event.DownloadFileProgress -> true
             is Event.ForcedSignOut -> true
             is Event.NoSpaceLeftOnDevice -> true
             is Event.Backup -> true
diff --git a/app/src/main/kotlin/me/proton/android/drive/usecase/notification/CreateUserNotificationId.kt b/app/src/main/kotlin/me/proton/android/drive/usecase/notification/CreateUserNotificationId.kt
index 2eb40837..77804a94 100644
--- a/app/src/main/kotlin/me/proton/android/drive/usecase/notification/CreateUserNotificationId.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/usecase/notification/CreateUserNotificationId.kt
@@ -21,7 +21,6 @@ package me.proton.android.drive.usecase.notification
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.announce.event.domain.entity.Event
 import me.proton.core.drive.notification.data.extension.createNotificationId
-import me.proton.core.drive.notification.data.extension.tag
 import me.proton.core.drive.notification.domain.entity.Channel
 import me.proton.core.drive.notification.domain.entity.TaglessNotificationId
 import me.proton.core.drive.notification.domain.extension.createTaglessNotificationId
@@ -32,9 +31,7 @@ class CreateUserNotificationId @Inject constructor() {
         userId: UserId,
         event: Event,
     ) = when (event) {
-        is Event.Download -> event.createNotificationId(userId).copy(
-            tag = "${event.tag}_${event.downloadId}"
-        )
+        is Event.Download -> event.createNotificationId(userId)
 
         // Foreground service in worker do not use tag
         is Event.TransferData -> TaglessNotificationId.UPLOAD.createTaglessNotificationId(
diff --git a/app/src/main/kotlin/me/proton/android/drive/usecase/notification/DownloadFileProgressNotificationBuilder.kt b/app/src/main/kotlin/me/proton/android/drive/usecase/notification/DownloadFileProgressNotificationBuilder.kt
new file mode 100644
index 00000000..a411109b
--- /dev/null
+++ b/app/src/main/kotlin/me/proton/android/drive/usecase/notification/DownloadFileProgressNotificationBuilder.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Drive.
+ *
+ * Proton Drive is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Drive is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Drive.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.android.drive.usecase.notification
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import androidx.core.app.NotificationCompat
+import androidx.core.net.toUri
+import dagger.hilt.android.qualifiers.ApplicationContext
+import me.proton.android.drive.extension.deepLinkBaseUrl
+import me.proton.android.drive.receiver.NotificationBroadcastReceiver
+import me.proton.android.drive.receiver.NotificationBroadcastReceiver.Companion.ACTION_CANCEL_ALL_DOWNLOADS
+import me.proton.android.drive.receiver.NotificationBroadcastReceiver.Companion.EXTRA_NOTIFICATION_ID
+import me.proton.android.drive.ui.navigation.Screen
+import me.proton.core.drive.announce.event.domain.entity.Event
+import me.proton.core.drive.notification.domain.entity.NotificationId
+import me.proton.core.util.kotlin.serialize
+import javax.inject.Inject
+import me.proton.core.drive.i18n.R as I18N
+
+class DownloadFileProgressNotificationBuilder @Inject constructor(
+    @param:ApplicationContext private val appContext: Context,
+    private val commonBuilder: CommonNotificationBuilder,
+    private val contentIntent: CreateContentPendingIntent,
+) {
+    operator fun invoke(
+        notificationId: NotificationId.User,
+        events: List<Event.DownloadFileProgress>,
+    ) = events.last().let { event ->
+        commonBuilder(notificationId, event)
+            .setContentText(
+                appContext.resources.getQuantityString(
+                    I18N.plurals.notification_content_text_download_downloading,
+                    event.downloadingCount,
+                    event.downloadingCount,
+                )
+            )
+            .setProgress(100, (event.progress.value * 100).toInt(), false)
+            .setSilent(true)
+            .setContentIntent(
+                contentIntent(
+                    notificationId = notificationId,
+                    uri = "${appContext.deepLinkBaseUrl}/${Screen.Files(notificationId.channel.userId)}".toUri(),
+                )
+            )
+            .addAction(
+                NotificationCompat.Action.Builder(
+                    0,
+                    appContext.getString(
+                        if (event.downloadingCount > 1) {
+                            I18N.string.common_cancel_all_action
+                        } else {
+                            I18N.string.common_cancel_action
+                        }
+                    ),
+                    cancelAllDownloadsIntent(notificationId),
+                ).build()
+            )
+    }
+
+    @SuppressLint("UnspecifiedImmutableFlag")
+    private fun cancelAllDownloadsIntent(
+        notificationId: NotificationId,
+        requestCode: Int = 8888,
+    ): PendingIntent =
+        PendingIntent.getBroadcast(
+            appContext,
+            requestCode,
+            Intent(appContext, NotificationBroadcastReceiver::class.java).apply {
+                action = ACTION_CANCEL_ALL_DOWNLOADS
+                putExtra(EXTRA_NOTIFICATION_ID, notificationId.serialize())
+            },
+            PendingIntent.FLAG_IMMUTABLE
+        )
+}
diff --git a/app/src/main/kotlin/me/proton/android/drive/usecase/notification/DownloadNotificationBuilder.kt b/app/src/main/kotlin/me/proton/android/drive/usecase/notification/DownloadNotificationBuilder.kt
index ab2e9848..05faa277 100644
--- a/app/src/main/kotlin/me/proton/android/drive/usecase/notification/DownloadNotificationBuilder.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/usecase/notification/DownloadNotificationBuilder.kt
@@ -35,10 +35,10 @@ class DownloadNotificationBuilder @Inject constructor(
     private val commonBuilder: CommonNotificationBuilder,
     private val contentIntent: CreateContentPendingIntent,
 ) {
-    operator fun invoke(notificationId: NotificationId.User, event: Event.Download) =
-        commonBuilder(notificationId, event)
+    operator fun invoke(notificationId: NotificationId.User, events: List<Event.Download>) =
+        commonBuilder(notificationId, events.last())
             .setContentTitle(appContext.getString(I18N.string.notification_content_title_download_complete))
-            .setContentText(event.text)
+            .setContentText(events.sumOf { it.downloadedFiles }.text)
             .setContentIntent(notificationId)
 
     private fun NotificationCompat.Builder.setContentIntent(
@@ -50,9 +50,9 @@ class DownloadNotificationBuilder @Inject constructor(
         )
     )
 
-    private val Event.Download.text: String get() =
+    private val Int.text: String get() =
         appContext.quantityString(
             I18N.plurals.common_in_app_notification_files_download_complete,
-            downloadedFiles,
+            this,
         )
 }
diff --git a/app/src/main/kotlin/me/proton/android/drive/usecase/notification/ShouldCancelNotification.kt b/app/src/main/kotlin/me/proton/android/drive/usecase/notification/ShouldCancelNotification.kt
index 5830045a..c1278364 100644
--- a/app/src/main/kotlin/me/proton/android/drive/usecase/notification/ShouldCancelNotification.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/usecase/notification/ShouldCancelNotification.kt
@@ -51,6 +51,7 @@ class ShouldCancelNotification @Inject constructor(
         }
 
         is Event.Download -> false
+        is Event.DownloadFileProgress -> event.downloadingCount == 0
         is Event.ForcedSignOut -> false
         is Event.NoSpaceLeftOnDevice -> false
         is Event.Backup -> false
diff --git a/app/src/main/kotlin/me/proton/android/drive/worker/NotificationActionWorker.kt b/app/src/main/kotlin/me/proton/android/drive/worker/NotificationActionWorker.kt
index 42392bb7..2d191afe 100644
--- a/app/src/main/kotlin/me/proton/android/drive/worker/NotificationActionWorker.kt
+++ b/app/src/main/kotlin/me/proton/android/drive/worker/NotificationActionWorker.kt
@@ -28,10 +28,12 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import me.proton.android.drive.extension.log
 import me.proton.android.drive.receiver.NotificationBroadcastReceiver.Companion.ACTION_CANCEL_ALL
+import me.proton.android.drive.receiver.NotificationBroadcastReceiver.Companion.ACTION_CANCEL_ALL_DOWNLOADS
 import me.proton.android.drive.receiver.NotificationBroadcastReceiver.Companion.ACTION_DELETE
 import me.proton.core.drive.base.domain.extension.resultValueOrNull
 import me.proton.core.drive.base.domain.log.LogTag
 import me.proton.core.drive.base.domain.util.coRunCatching
+import me.proton.core.drive.drivelink.download.domain.usecase.CancelAllDownload
 import me.proton.core.drive.notification.domain.entity.NotificationId
 import me.proton.core.drive.notification.domain.usecase.RemoveNotification
 import me.proton.core.drive.share.domain.usecase.GetMainShare
@@ -46,6 +48,7 @@ class NotificationActionWorker @AssistedInject constructor(
     private val removeNotification: RemoveNotification,
     private val getMainShare: GetMainShare,
     private val cancelAllUpload: CancelAllUpload,
+    private val cancelAllDownload: CancelAllDownload,
 ) : CoroutineWorker(appContext, params) {
     private val action = inputData.getString(KEY_ACTION)
     private val notificationIdString = inputData.getString(KEY_NOTIFICATION_ID)
@@ -79,6 +82,7 @@ class NotificationActionWorker @AssistedInject constructor(
                         shareId,
                     )
                 }
+                ACTION_CANCEL_ALL_DOWNLOADS -> cancelAllDownload(notificationId.channel.userId)
                 else -> RuntimeException("Unknown action '$action'").log(LogTag.NOTIFICATION)
             }
         }
diff --git a/build.gradle.kts b/build.gradle.kts
index 8083c175..f9233be6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -64,6 +64,9 @@ allprojects {
             resolutionStrategy.dependencySubstitution {
                 substitute(module("com.google.protobuf:protobuf-lite"))
                     .using(module("com.google.protobuf:protobuf-javalite:${libs.versions.protobufJavaLite.get()}"))
+                substitute(module("androidx.navigation:navigation-compose"))
+                    .using(module("androidx.navigation:navigation-compose:${libs.versions.androidx.navigation.get()}"))
+                    .because("androidx-hilt 1.3.0 brings androidx.navigation version 2.9.0 which is more strict that currently used")
             }
         }
     }
@@ -72,11 +75,12 @@ allprojects {
 subprojects {
     configurations.all {
         exclude(group = "me.proton.crypto", module = "android-golib")
+        exclude(group = "org.jetbrains.kotlin", module = "kotlin-android-extensions-runtime")
     }
 }
 
 tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }
 
 tasks.register("deleteTest", Delete::class) {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index b7528efa..e6e18c8b 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -23,6 +23,7 @@ plugins {
 dependencies {
     implementation(libs.gradle.plugin.android)
     implementation(libs.gradle.plugin.kotlin)
+    implementation(libs.gradle.plugin.ksp)
     implementation("com.squareup:javapoet:1.13.0") // https://github.com/google/dagger/issues/3068#issuecomment-999118496
 }
 
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index a4a7a40d..c5d28b28 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -22,7 +22,7 @@ object Config {
     const val minSdk = 29
     const val targetSdk = 35
     const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    const val versionName = "2.35.0"
+    const val versionName = "2.36.0"
     const val archivesBaseName = "ProtonDrive-$versionName"
     val supportedResourceConfigurations = listOf(
         "b+es+419",
diff --git a/buildSrc/src/main/kotlin/DriveModule.kt b/buildSrc/src/main/kotlin/DriveModule.kt
index ef321da7..60ec6975 100644
--- a/buildSrc/src/main/kotlin/DriveModule.kt
+++ b/buildSrc/src/main/kotlin/DriveModule.kt
@@ -30,7 +30,7 @@ import org.gradle.kotlin.dsl.findByType
 import org.gradle.kotlin.dsl.getByType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
-import org.jetbrains.kotlin.gradle.plugin.KaptExtension
+import com.google.devtools.ksp.gradle.KspExtension
 import java.io.File
 
 @Suppress("LongMethod")
@@ -43,16 +43,16 @@ fun Project.driveModule(
     includeSubmodules: Boolean = false,
     i18n: Boolean = false,
     socialTest: Boolean = false,
-    kapt: Boolean = hilt || room || socialTest,
     showkase: Boolean = false,
+    ksp: Boolean = showkase || hilt || socialTest || room,
     buildConfig: Boolean = false,
     enableTestFixtures: Boolean = false,
     dependencies: DependencyHandler.() -> Unit = {},
 ) {
     val catalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
     apply(plugin = "kotlin-android")
-    if (kapt) {
-        apply(plugin = "kotlin-kapt")
+    if (ksp) {
+        apply(plugin = "com.google.devtools.ksp")
     }
     if (compose) {
         apply(plugin = "org.jetbrains.kotlin.plugin.compose")
@@ -72,12 +72,6 @@ fun Project.driveModule(
             applicationId = Config.applicationId
             versionCode = versionCodeFromGitCommitCount
             versionName = Config.versionName
-
-            javaCompileOptions {
-                annotationProcessorOptions {
-                    arguments["room.schemaLocation"] = "$projectDir/schemas"
-                }
-            }
         }
 
         buildTypes {
@@ -102,6 +96,15 @@ fun Project.driveModule(
             this.buildConfig = buildConfig
         }
 
+        packaging {
+            resources.excludes.add("META-INF/licenses/**")
+            resources.excludes.add("META-INF/LICENSE*")
+            resources.excludes.add("META-INF/AL2.0")
+            resources.excludes.add("META-INF/LGPL2.1")
+            resources.excludes.add("licenses/*.txt")
+            resources.excludes.add("licenses/*.xml")
+        }
+
         configureJvmTarget()
     }
 
@@ -114,14 +117,6 @@ fun Project.driveModule(
             }
         }
 
-        defaultConfig {
-            javaCompileOptions {
-                annotationProcessorOptions {
-                    arguments["room.schemaLocation"] = "$projectDir/schemas"
-                }
-            }
-        }
-
         buildTypes {
             debug {
                 enableUnitTestCoverage = true
@@ -136,15 +131,23 @@ fun Project.driveModule(
             this.buildConfig = buildConfig
         }
 
+        packaging {
+            resources.excludes.add("META-INF/licenses/**")
+            resources.excludes.add("META-INF/LICENSE*")
+            resources.excludes.add("META-INF/AL2.0")
+            resources.excludes.add("META-INF/LGPL2.1")
+            resources.excludes.add("licenses/*.txt")
+            resources.excludes.add("licenses/*.xml")
+        }
+
         configureJvmTarget()
     }
 
-    extensions.findByType(KaptExtension::class.java)?.let { kaptExt ->
-        kaptExt.arguments {
-            if (showkase) {
-                arg("skipPrivatePreviews", "true")
-            }
-        }
+    if (showkase) {
+        extensions.findByType<KspExtension>()?.arg("skipPrivatePreviews", "true")
+    }
+    if (room) {
+        extensions.findByType<KspExtension>()?.arg("room.schemaLocation", "$projectDir/schemas")
     }
 
     extensions.configure<TestedExtension> {
@@ -170,15 +173,6 @@ fun Project.driveModule(
             targetCompatibility = JavaVersion.VERSION_17
         }
 
-        packagingOptions {
-            resources.excludes.add("META-INF/licenses/**")
-            resources.excludes.add("META-INF/LICENSE*")
-            resources.excludes.add("META-INF/AL2.0")
-            resources.excludes.add("META-INF/LGPL2.1")
-            resources.excludes.add("licenses/*.txt")
-            resources.excludes.add("licenses/*.xml")
-        }
-
         testOptions {
             unitTests {
                 isIncludeAndroidResources = true
@@ -204,14 +198,14 @@ fun Project.driveModule(
             }
         }
         if (room) {
-            add("kapt", catalog.findLibrary("androidx.room.compiler").get())
+            add("ksp", catalog.findLibrary("androidx.room.compiler").get())
             add("implementation", catalog.findLibrary("core.dataRoom").get())
             add("implementation", catalog.findLibrary("androidx.room.ktx").get())
         }
         if (hilt) {
             add("implementation", catalog.findLibrary("dagger.hilt.android").get())
-            add("kapt", catalog.findLibrary("dagger.hilt.compiler").get())
-            add("kapt", catalog.findLibrary("androidx.hilt.compiler").get())
+            add("ksp", catalog.findLibrary("dagger.hilt.compiler").get())
+            add("ksp", catalog.findLibrary("androidx.hilt.compiler").get())
         }
         if (workManager) {
             if (hilt) {
@@ -233,7 +227,7 @@ fun Project.driveModule(
         }
         if (showkase) {
             add("debugImplementation", catalog.findLibrary("showkase").get())
-            add("kaptDebug", catalog.findLibrary("showkaseProcessor").get())
+            add("kspDebug", catalog.findLibrary("showkaseProcessor").get())
         }
 
         // region Test
@@ -242,7 +236,7 @@ fun Project.driveModule(
         if (socialTest) {
             add("testImplementation", project(":drive:test"))
             add("testImplementation", catalog.findLibrary("dagger.hilt.android.testing").get())
-            add("kaptTest", catalog.findLibrary("dagger.hilt.compiler").get())
+            add("kspTest", catalog.findLibrary("dagger.hilt.compiler").get())
         }
         // endregion
     }
diff --git a/buildSrc/src/main/kotlin/Jacoco.kt b/buildSrc/src/main/kotlin/Jacoco.kt
index df945b6e..7e08faca 100644
--- a/buildSrc/src/main/kotlin/Jacoco.kt
+++ b/buildSrc/src/main/kotlin/Jacoco.kt
@@ -70,17 +70,17 @@ fun Project.configureJacoco(flavor: String = "", srcFolder: String = "kotlin") {
             "**/ch/protonmail/**",
         )
 
-        val debugTree = fileTree("$buildDir/tmp/kotlin-classes/$taskName") { exclude(fileFilter) }
+        val debugTree = fileTree(project.layout.buildDirectory.dir("tmp/kotlin-classes/$taskName").get().asFile) { exclude(fileFilter) }
         val mainSrc = "$projectDir/src/main/$srcFolder"
 
         sourceDirectories.setFrom(mainSrc)
         classDirectories.setFrom(debugTree)
-        executionData.setFrom(fileTree(buildDir) { include(listOf("**/*.exec", "**/*.ec")) })
+        executionData.setFrom(fileTree(project.layout.buildDirectory.get().asFile) { include(listOf("**/*.exec", "**/*.ec")) })
     }.dependsOn("test${taskName.capitalize(Locale.ENGLISH)}UnitTest")
 
     tasks.register("coverageReport") {
         dependsOn("jacocoTestReport")
-        val reportFile = project.file("$buildDir/reports/jacoco/jacocoTestReport/jacocoTestReport.xml")
+        val reportFile = project.layout.buildDirectory.file("reports/jacoco/jacocoTestReport/jacocoTestReport.xml").get().asFile
         inputs.files(reportFile).withPropertyName("reportFile")
         onlyIf { reportFile.exists() }
         doLast {
@@ -111,8 +111,8 @@ fun Project.configureJacoco(flavor: String = "", srcFolder: String = "kotlin") {
 
     tasks.register<Exec>("coberturaCoverageReport") {
         dependsOn("coverageReport")
-        val jacocoFile = project.file("$buildDir/reports/jacoco/jacocoTestReport/jacocoTestReport.xml")
-        val coberturaFile = project.file( "$buildDir/reports/cobertura-coverage.xml")
+        val jacocoFile = project.layout.buildDirectory.file("reports/jacoco/jacocoTestReport/jacocoTestReport.xml").get().asFile
+        val coberturaFile = project.layout.buildDirectory.file("reports/cobertura-coverage.xml").get().asFile
         inputs.file(jacocoFile).withPropertyName("jacocoFile")
         outputs.file(coberturaFile)
         workingDir = File(rootDir, "buildSrc")
diff --git a/drive/announce-event/domain/src/main/kotlin/me/proton/core/drive/announce/event/domain/entity/Event.kt b/drive/announce-event/domain/src/main/kotlin/me/proton/core/drive/announce/event/domain/entity/Event.kt
index a981cc1f..cad71f2b 100644
--- a/drive/announce-event/domain/src/main/kotlin/me/proton/core/drive/announce/event/domain/entity/Event.kt
+++ b/drive/announce-event/domain/src/main/kotlin/me/proton/core/drive/announce/event/domain/entity/Event.kt
@@ -169,6 +169,15 @@ sealed class Event {
         override val occurredAt: TimestampMs = TimestampMs()
     }
 
+    @Serializable
+    data class DownloadFileProgress(
+        val downloadingCount: Int,
+        val progress: Percentage,
+    ) : Event() {
+        override val id: String = "$EVENT_ID_PREFIX${this.javaClass.simpleName.uppercase()}_1"
+        override val occurredAt: TimestampMs = TimestampMs()
+    }
+
     data object ForcedSignOut : Event() {
         override val id: String = "$EVENT_ID_PREFIX${this.javaClass.simpleName.uppercase()}_1"
         override val occurredAt: TimestampMs = TimestampMs()
diff --git a/drive/announce-event/domain/src/main/kotlin/me/proton/core/drive/announce/event/domain/usecase/AnnounceEvent.kt b/drive/announce-event/domain/src/main/kotlin/me/proton/core/drive/announce/event/domain/usecase/AnnounceEvent.kt
index 086e254f..714b1ab0 100644
--- a/drive/announce-event/domain/src/main/kotlin/me/proton/core/drive/announce/event/domain/usecase/AnnounceEvent.kt
+++ b/drive/announce-event/domain/src/main/kotlin/me/proton/core/drive/announce/event/domain/usecase/AnnounceEvent.kt
@@ -23,7 +23,6 @@ import me.proton.core.drive.announce.event.domain.handler.EventHandler
 import me.proton.core.drive.base.domain.log.LogTag.ANNOUNCE_EVENT
 import me.proton.core.drive.base.domain.usecase.ReportError
 import me.proton.core.drive.base.domain.util.coRunCatching
-import me.proton.core.util.kotlin.CoreLogger
 import javax.inject.Inject
 
 class AnnounceEvent @Inject constructor(
diff --git a/drive/backup/data/src/main/kotlin/me/proton/core/drive/backup/data/manager/BackupManagerImpl.kt b/drive/backup/data/src/main/kotlin/me/proton/core/drive/backup/data/manager/BackupManagerImpl.kt
index 9028c63d..73690be7 100644
--- a/drive/backup/data/src/main/kotlin/me/proton/core/drive/backup/data/manager/BackupManagerImpl.kt
+++ b/drive/backup/data/src/main/kotlin/me/proton/core/drive/backup/data/manager/BackupManagerImpl.kt
@@ -103,7 +103,7 @@ class BackupManagerImpl @Inject constructor(
     }
 
     override fun sync(backupFolder: BackupFolder, uploadPriority: Long) {
-        CoreLogger.i(BACKUP, "Sync bucket: ${backupFolder.bucketId.toBase36()}}")
+        CoreLogger.i(BACKUP, "Sync bucket: ${backupFolder.bucketId.toBase36()}")
         workManager
             .beginUniqueWork(
                 backupFolder.uniqueScanWorkName(),
diff --git a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/api/Dto.kt b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/api/Dto.kt
index 48eba3cc..b06efca4 100644
--- a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/api/Dto.kt
+++ b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/api/Dto.kt
@@ -41,6 +41,7 @@ object Dto {
     const val BLOCK_LIST = "BlockList"
     const val BLOCK_NUMBER = "BlockNumber"
     const val CAPTURE_TIME = "CaptureTime"
+    const val CHECKSUM_VERIFIED = "ChecksumVerified"
     const val CHILD_LINK_IDS = "ChildLinkIDs"
     const val CLIENT_UID = "ClientUID"
     const val CLIENT_UIDS = "ClientUIDs"
diff --git a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/db/Column.kt b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/db/Column.kt
index 95b42ca7..21156469 100644
--- a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/db/Column.kt
+++ b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/db/Column.kt
@@ -30,6 +30,7 @@ object Column {
     const val CACHE_OPTION = "cache_option"
     const val CAPTURE_TIME = "capture_time"
     const val CHANNEL_TYPE = "channel_type"
+    const val CHECKSUM_VERIFIED = "checksum_verified"
     const val CONTENT = "content"
     const val CLIENT_UID = "client_uid"
     const val CONTENT_HASH = "content_hash"
@@ -60,6 +61,7 @@ object Column {
     const val INVITEE_EMAIL = "invitee_email"
     const val INVITER_EMAIL = "inviter_email"
     const val IS_CHILD_OF_ALBUM = "is_child_of_album"
+    const val IS_COMPLETE = "is_complete"
     const val IS_SHARED = "is_shared"
     const val KEY = "key"
     const val KEY_PACKET = "key_packet"
diff --git a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/db/LoggingOpenHelperFactory.kt b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/db/LoggingOpenHelperFactory.kt
index 10d7ddd9..4166a3e1 100644
--- a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/db/LoggingOpenHelperFactory.kt
+++ b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/db/LoggingOpenHelperFactory.kt
@@ -64,6 +64,11 @@ class LoggingOpenHelperFactory<T : RoomDatabase>(
     }
 }
 
+private class SlowQueryException(
+    message: String? = null,
+    cause: Throwable? = null,
+) : Throwable(message, cause)
+
 private class LoggingDatabase<T : RoomDatabase>(
     private val activityManager: ActivityManager,
     private val delegate: SupportSQLiteDatabase,
@@ -71,10 +76,6 @@ private class LoggingDatabase<T : RoomDatabase>(
     private val captureStackForSlow: Duration,
     private val clazz: Class<T>,
 ) : SupportSQLiteDatabase by delegate {
-    private class SlowQueryException(
-        message: String? = null,
-        cause: Throwable? = null,
-    ) : Throwable(message, cause)
 
     private val Duration.shouldLog: Boolean get() = this > slowThreshold
     private val Duration.throwable: Throwable? get() = takeIf {
@@ -169,7 +170,7 @@ private class LoggingStatement<T : RoomDatabase>(
     private val Duration.throwable: Throwable? get() = takeIf {
         this > captureStackForSlow && captureStackForSlow > Duration.ZERO
     }?.let {
-        RuntimeException("Slow DB query detected (${activityManager.logMemoryInfo}).").apply {
+        SlowQueryException("Slow DB query detected (${activityManager.logMemoryInfo}).").apply {
             stackTrace = Thread.currentThread().stackTrace
         }
     }
diff --git a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/db/paging/Flow.kt b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/db/paging/Flow.kt
index b691df93..6cb786ea 100644
--- a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/db/paging/Flow.kt
+++ b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/db/paging/Flow.kt
@@ -24,7 +24,8 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -41,7 +42,6 @@ import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.domain.extension.mapWithPrevious
 import me.proton.core.drive.base.domain.log.LogTag
 import me.proton.core.util.kotlin.CoreLogger
-import kotlin.coroutines.CoroutineContext
 import kotlin.math.ceil
 
 /**
@@ -57,6 +57,12 @@ fun <T : Any> Flow<Result<List<T>>>.asPagingSource(
 ): PagingSource<Int, T> =
     object : PagingSource<Int, T>() {
 
+        private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+
+        init {
+            registerInvalidatedCallback { scope.cancel() }
+        }
+
         private val listFlow: StateFlow<Result<List<T>>?> =
             takeWhile { invalid.not() }
                 .distinctUntilChanged()
@@ -66,7 +72,7 @@ fun <T : Any> Flow<Result<List<T>>>.asPagingSource(
                     }
                     current
                 }
-                .stateIn(PagingSourceScope, SharingStarted.Eagerly, null)
+                .stateIn(scope, SharingStarted.Eagerly, null)
 
         override fun getRefreshKey(state: PagingState<Int, T>): Int? {
             return state.anchorPosition?.let { anchorPosition ->
@@ -117,11 +123,6 @@ fun <T : Any> Flow<Result<List<T>>>.asPagingSource(
         }
     }
 
-object PagingSourceScope : CoroutineScope {
-    override val coroutineContext: CoroutineContext
-        get() = Dispatchers.IO + Job()
-}
-
 @OptIn(ExperimentalCoroutinesApi::class)
 fun <T : Any> ((fromIndex: Int, count: Int) -> Flow<Result<List<T>>>).asPagingSource(
     sourceSize: Flow<Int>,
@@ -131,6 +132,12 @@ fun <T : Any> ((fromIndex: Int, count: Int) -> Flow<Result<List<T>>>).asPagingSo
 ): PagingSource<Int, T> =
     object : PagingSource<Int, T>() {
 
+        private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+
+        init {
+            registerInvalidatedCallback { scope.cancel() }
+        }
+
         private val itemsCount: StateFlow<Int?> = sourceSize
             .takeWhile { invalid.not() }
             .distinctUntilChanged()
@@ -144,7 +151,7 @@ fun <T : Any> ((fromIndex: Int, count: Int) -> Flow<Result<List<T>>>).asPagingSo
                 }
                 current
             }
-            .stateIn(PagingSourceScope, SharingStarted.Eagerly, null)
+            .stateIn(scope, SharingStarted.Eagerly, null)
 
         private val fromIndex = MutableStateFlow<Int?>(null)
 
@@ -169,7 +176,7 @@ fun <T : Any> ((fromIndex: Int, count: Int) -> Flow<Result<List<T>>>).asPagingSo
                         }
                 )
             }
-            .stateIn(PagingSourceScope, SharingStarted.Eagerly, null)
+            .stateIn(scope, SharingStarted.Eagerly, null)
 
         override fun getRefreshKey(state: PagingState<Int, T>): Int? =
             state.anchorPosition?.let { anchorPosition ->
diff --git a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/extension/ApiException.kt b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/extension/ApiException.kt
index 71b194f1..b7eebf1a 100644
--- a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/extension/ApiException.kt
+++ b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/extension/ApiException.kt
@@ -38,16 +38,19 @@ fun ApiException.log(
     message: String? = null,
     level: LoggerLevel? = null
 ): ApiException = also {
-    val loggerLevel = level ?: when (val cause = error) {
-        is ApiResult.Error.Certificate -> LoggerLevel.ERROR
-        is ApiResult.Error.Http -> when (cause.httpCode) {
-            502, 503 -> LoggerLevel.ERROR
-            else -> LoggerLevel.DEBUG
-        }
-        is ApiResult.Error.Parse -> LoggerLevel.ERROR
+    val loggerLevel = level ?: loggerLevel()
+    loggerLevel.log(tag, this, message)
+}
+
+internal fun ApiException.loggerLevel(): LoggerLevel = when (val cause = error) {
+    is ApiResult.Error.Certificate -> LoggerLevel.ERROR
+    is ApiResult.Error.Http -> when (cause.httpCode) {
+        502, 503 -> LoggerLevel.ERROR
         else -> LoggerLevel.DEBUG
     }
-    loggerLevel.log(tag, this, message)
+
+    is ApiResult.Error.Parse -> LoggerLevel.ERROR
+    else -> LoggerLevel.DEBUG
 }
 
 fun ApiException.isHttpError(range: IntRange): Boolean =
diff --git a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/extension/OperationAbortedException.kt b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/extension/OperationAbortedException.kt
index 64e8a8d5..a0f55160 100644
--- a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/extension/OperationAbortedException.kt
+++ b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/extension/OperationAbortedException.kt
@@ -20,6 +20,8 @@ package me.proton.core.drive.base.data.extension
 import android.content.Context
 import me.proton.core.drive.base.data.entity.LoggerLevel
 import me.proton.drive.sdk.OperationAbortedException
+import me.proton.drive.sdk.ProtonDriveSdkException
+import me.proton.drive.sdk.ProtonSdkError.ErrorDomain
 import me.proton.core.drive.i18n.R as I18N
 
 fun OperationAbortedException.getDefaultMessage(
@@ -31,5 +33,10 @@ fun OperationAbortedException.log(
     message: String? = null,
     level: LoggerLevel? = LoggerLevel.ERROR,
 ): OperationAbortedException = also {
-    level.log(tag, this, message)
+    val abortCause = cause
+    if (abortCause is ProtonDriveSdkException && abortCause.error?.domain == ErrorDomain.SuccessfulCancellation) {
+        LoggerLevel.DEBUG
+    } else {
+        level
+    }.log(tag, this, message)
 }
diff --git a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/extension/RuntimeException.kt b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/extension/RuntimeException.kt
index 0936f652..2ca14b2c 100644
--- a/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/extension/RuntimeException.kt
+++ b/drive/base/data/src/main/kotlin/me/proton/core/drive/base/data/extension/RuntimeException.kt
@@ -19,6 +19,7 @@ package me.proton.core.drive.base.data.extension
 
 import android.content.Context
 import me.proton.core.drive.base.data.entity.LoggerLevel
+import me.proton.core.network.domain.ApiException
 import me.proton.core.drive.i18n.R as I18N
 
 fun RuntimeException.getDefaultMessage(context: Context): String =
@@ -29,5 +30,10 @@ fun RuntimeException.log(
     message: String? = null,
     level: LoggerLevel? = LoggerLevel.ERROR,
 ): RuntimeException = also {
-    level.log(tag, this, message)
+    val runtimeCause = cause
+    if (level == LoggerLevel.ERROR && runtimeCause is ApiException) {
+        runtimeCause.loggerLevel()
+    } else {
+        level
+    }.log(tag, this, message)
 }
diff --git a/drive/base/domain/src/main/kotlin/me/proton/core/drive/base/domain/provider/ConfigurationProvider.kt b/drive/base/domain/src/main/kotlin/me/proton/core/drive/base/domain/provider/ConfigurationProvider.kt
index 5f8d884d..5732889c 100644
--- a/drive/base/domain/src/main/kotlin/me/proton/core/drive/base/domain/provider/ConfigurationProvider.kt
+++ b/drive/base/domain/src/main/kotlin/me/proton/core/drive/base/domain/provider/ConfigurationProvider.kt
@@ -83,7 +83,6 @@ interface ConfigurationProvider {
     val backupMaxAttempts: Long get() = 5
     val backupSyncWindow: Duration get() = 1.days
     val photoExportData: Boolean get() = false
-    val checkDuplicatesPageSize: Int get() = 50
     val featureFlagFreshDuration: Duration get() = 10.minutes
     val featureFlagLegacyFreshDuration: Duration get() = 1.days
     val useVerifier: Boolean get() = true
@@ -118,15 +117,13 @@ interface ConfigurationProvider {
     val addToRemoveFromAlbumMaxApiDataSize: Int get() = 10
     val maxApiBatchDataSize: Int get() = 100
     val contentDigestsInParallel: Int get() = 10
-    val minimumPhotosImportantUpdatesInterval: Duration get() = 7.days
-    val minimumPhotoShareMigrationStatusFetchInterval: Duration get() = 10.seconds
     val savePhotoToStreamLimit: Long get() = 100
-    val photoListingsPageSize: Int get() = 25_000
     val sendPhotoTagsInCommit: Boolean get() = true
     val preferSdkForUpload: Boolean get() = true
     val preferSdkForDownload: Boolean get() = true
     val preferSdkForThumbnail: Boolean get() = true
     val preferSdkForNodeOperation: Boolean get() = false
+    val preferSdkForTrash: Boolean get() = false
     val createFolderInParallel: Int get() = 16
     val sdkQueueTimeout: Duration get() = 30.seconds
     val tabsLoadTimeout: Duration get() = 3.seconds
diff --git a/drive/base/domain/src/main/kotlin/me/proton/core/drive/base/domain/util/RequestBatcher.kt b/drive/base/domain/src/main/kotlin/me/proton/core/drive/base/domain/util/RequestBatcher.kt
index f98759cf..9d8bed3a 100644
--- a/drive/base/domain/src/main/kotlin/me/proton/core/drive/base/domain/util/RequestBatcher.kt
+++ b/drive/base/domain/src/main/kotlin/me/proton/core/drive/base/domain/util/RequestBatcher.kt
@@ -112,8 +112,8 @@ class RequestBatcher<K, I, R>(
         } catch (cancellationException: CancellationException) {
             requests.completeExceptionally { cancellationException }
             throw cancellationException
-        } catch (exception: Exception) {
-            requests.completeExceptionally { exception }
+        } catch (throwable: Throwable) {
+            requests.completeExceptionally { throwable }
         }
     }
 
diff --git a/drive/base/presentation/src/main/kotlin/me/proton/core/drive/base/presentation/component/FastScroller.kt b/drive/base/presentation/src/main/kotlin/me/proton/core/drive/base/presentation/component/FastScroller.kt
index 4c1c7738..b44fd616 100644
--- a/drive/base/presentation/src/main/kotlin/me/proton/core/drive/base/presentation/component/FastScroller.kt
+++ b/drive/base/presentation/src/main/kotlin/me/proton/core/drive/base/presentation/component/FastScroller.kt
@@ -184,7 +184,7 @@ fun FastScroller(
             (snappedOffsetY / stepPx).roundToInt()
         }
     }
-    LaunchedEffect(Unit) {
+    LaunchedEffect(state) {
         combine(
             snapshotFlow { snappedOffsetY }.map { (it / stepPx).roundToInt() },
             snapshotFlow { state.firstVisibleItemIndex }
diff --git a/drive/base/presentation/src/main/kotlin/me/proton/core/drive/base/presentation/component/TopAppBar.kt b/drive/base/presentation/src/main/kotlin/me/proton/core/drive/base/presentation/component/TopAppBar.kt
index 9e3c5784..5c5f1b27 100644
--- a/drive/base/presentation/src/main/kotlin/me/proton/core/drive/base/presentation/component/TopAppBar.kt
+++ b/drive/base/presentation/src/main/kotlin/me/proton/core/drive/base/presentation/component/TopAppBar.kt
@@ -59,6 +59,7 @@ import me.proton.core.drive.base.presentation.component.TopAppBarComponentTestTa
 @Composable
 fun TopAppBar(
     navigationIcon: Painter?,
+    navigationContentDescription: String?,
     onNavigationIcon: () -> Unit,
     title: String,
     modifier: Modifier = Modifier,
@@ -69,6 +70,7 @@ fun TopAppBar(
 ) {
     TopAppBar(
         navigationIcon = navigationIcon,
+        navigationContentDescription = navigationContentDescription,
         onNavigationIcon = onNavigationIcon,
         title = { modifier ->
             Title(
@@ -87,6 +89,7 @@ fun TopAppBar(
 @Composable
 fun TopAppBar(
     navigationIcon: Painter?,
+    navigationContentDescription: String?,
     onNavigationIcon: () -> Unit,
     title: @Composable (Modifier) -> Unit,
     modifier: Modifier = Modifier,
@@ -97,12 +100,13 @@ fun TopAppBar(
     actions: @Composable RowScope.() -> Unit = {},
 ) {
     TopAppBar(
-        modifier = modifier,
-        title = { title(Modifier.testTag(TopAppBarComponentTestTag.appBar)) },
+        modifier = modifier.testTag(TopAppBarComponentTestTag.appBar),
+        title = { title(Modifier.testTag(TopAppBarComponentTestTag.appBarTitle)) },
         navigationIcon = {
             if (navigationIcon != null) {
                 NavigationIconButton(
                     navigationIcon = navigationIcon,
+                    navigationContentDescription = navigationContentDescription,
                     onNavigationIcon = onNavigationIcon,
                     notificationDotVisible = notificationDotVisible
                 )
@@ -137,6 +141,7 @@ fun Title(
 @Composable
 private fun NavigationIconButton(
     navigationIcon: Painter,
+    navigationContentDescription: String?,
     onNavigationIcon: () -> Unit,
     notificationDotVisible: Boolean
 ) {
@@ -149,7 +154,7 @@ private fun NavigationIconButton(
         ) { modifier ->
             Icon(
                 painter = navigationIcon,
-                contentDescription = null,
+                contentDescription = navigationContentDescription,
                 modifier = modifier.padding(4.dp),
             )
         }
@@ -242,6 +247,7 @@ val TopAppBarHeight = 56.dp
 
 object TopAppBarComponentTestTag {
     const val appBar = "top app bar"
+    const val appBarTitle = "top app bar title"
     const val navigationButton = "top app bar navigation button"
     const val actionButton = "top app bar action button"
 }
diff --git a/drive/contact/domain/src/main/kotlin/me/proton/core/drive/contact/domain/usecase/GetContactEmails.kt b/drive/contact/domain/src/main/kotlin/me/proton/core/drive/contact/domain/usecase/GetContactEmails.kt
index 38bd9d82..34fe7770 100644
--- a/drive/contact/domain/src/main/kotlin/me/proton/core/drive/contact/domain/usecase/GetContactEmails.kt
+++ b/drive/contact/domain/src/main/kotlin/me/proton/core/drive/contact/domain/usecase/GetContactEmails.kt
@@ -38,4 +38,13 @@ class GetContactEmails @Inject constructor(
             refresh = false,
         ).first { contactEmail -> contactEmail.email == email }
     }
+
+    suspend operator fun invoke(userId: UserId, emails: Set<String>): Result<Map<String, ContactEmail>> = coRunCatching {
+        if (emails.isEmpty()) {
+            return@coRunCatching emptyMap()
+        }
+        contactRepository.getAllContactEmails(userId = userId, refresh = false)
+            .filter { contactEmail -> contactEmail.email in emails }
+            .associateBy { contactEmail -> contactEmail.email }
+    }
 }
diff --git a/drive/crypto/domain/src/main/kotlin/me/proton/core/drive/crypto/domain/usecase/base/UseHashKey.kt b/drive/crypto/domain/src/main/kotlin/me/proton/core/drive/crypto/domain/usecase/base/UseHashKey.kt
index 13abb8a5..712c6460 100644
--- a/drive/crypto/domain/src/main/kotlin/me/proton/core/drive/crypto/domain/usecase/base/UseHashKey.kt
+++ b/drive/crypto/domain/src/main/kotlin/me/proton/core/drive/crypto/domain/usecase/base/UseHashKey.kt
@@ -19,8 +19,9 @@ package me.proton.core.drive.crypto.domain.usecase.base
 
 import me.proton.core.crypto.common.pgp.HashKey
 import me.proton.core.crypto.common.pgp.VerificationStatus
-import me.proton.core.drive.base.domain.extension.resultValueOrNull
+import me.proton.core.drive.base.domain.extension.resultValueOrThrow
 import me.proton.core.drive.base.domain.log.LogTag
+import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.cryptobase.domain.CryptoScope
 import me.proton.core.drive.cryptobase.domain.exception.VerificationException
 import me.proton.core.drive.cryptobase.domain.usecase.UseHashKey
@@ -68,11 +69,9 @@ class UseHashKey @Inject constructor(
         checkSignature: Boolean = false,
         coroutineContext: CoroutineContext = CryptoScope.EncryptAndDecrypt.coroutineContext,
         block: suspend (HashKey) -> T,
-    ): Result<T> {
-        val folder = requireNotNull(getLink(folderId).resultValueOrNull()) {
-            "Cannot found folder: $folderId"
-        }
-        return invoke(folder, checkSignature, coroutineContext, block)
+    ): Result<T> = coRunCatching {
+        val folder = getLink(folderId).resultValueOrThrow()
+        invoke(folder, checkSignature, coroutineContext, block).getOrThrow()
     }
 
     suspend operator fun <T> invoke(
@@ -80,9 +79,9 @@ class UseHashKey @Inject constructor(
         checkSignature: Boolean = false,
         coroutineContext: CoroutineContext = CryptoScope.EncryptAndDecrypt.coroutineContext,
         block: suspend (HashKey) -> T,
-    ) : Result<T> {
+    ) : Result<T> = coRunCatching {
         val folderKey = getNodeKey(folder).getOrThrow()
         val folderHashKey = getNodeHashKey(folder, folderKey).getOrThrow()
-        return invoke(folderHashKey, checkSignature, coroutineContext, block)
+        invoke(folderHashKey, checkSignature, coroutineContext, block).getOrThrow()
     }
 }
diff --git a/drive/crypto/domain/src/main/kotlin/me/proton/core/drive/crypto/domain/usecase/file/AvoidDuplicateFileNameSdk.kt b/drive/crypto/domain/src/main/kotlin/me/proton/core/drive/crypto/domain/usecase/file/AvoidDuplicateFileNameSdk.kt
index 6693d2ad..ef9a4031 100644
--- a/drive/crypto/domain/src/main/kotlin/me/proton/core/drive/crypto/domain/usecase/file/AvoidDuplicateFileNameSdk.kt
+++ b/drive/crypto/domain/src/main/kotlin/me/proton/core/drive/crypto/domain/usecase/file/AvoidDuplicateFileNameSdk.kt
@@ -21,6 +21,7 @@ package me.proton.core.drive.crypto.domain.usecase.file
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.base.domain.provider.ProtonDriveClientProvider
 import me.proton.core.drive.base.domain.util.coRunCatching
+import me.proton.drive.sdk.entity.NodeUid
 import javax.inject.Inject
 
 class AvoidDuplicateFileNameSdk @Inject constructor(
@@ -28,7 +29,7 @@ class AvoidDuplicateFileNameSdk @Inject constructor(
 ) {
     suspend operator fun invoke(
         userId: UserId,
-        parentFolderUid: String,
+        parentFolderUid: NodeUid,
         name: String,
     ): Result<String> = coRunCatching {
 
diff --git a/drive/db/schemas/me.proton.android.drive.db.DriveDatabase/103.json b/drive/db/schemas/me.proton.android.drive.db.DriveDatabase/103.json
new file mode 100644
index 00000000..52ab13b0
--- /dev/null
+++ b/drive/db/schemas/me.proton.android.drive.db.DriveDatabase/103.json
@@ -0,0 +1,11100 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 103,
+    "identityHash": "9728274bca167bb0d13de243f9b198a2",
+    "entities": [
+      {
+        "tableName": "AccountEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `username` TEXT, `email` TEXT, `state` TEXT NOT NULL, `sessionId` TEXT, `sessionState` TEXT, PRIMARY KEY(`userId`), FOREIGN KEY(`sessionId`) REFERENCES `SessionEntity`(`sessionId`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sessionId",
+            "columnName": "sessionId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "sessionState",
+            "columnName": "sessionState",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AccountEntity_sessionId",
+            "unique": false,
+            "columnNames": [
+              "sessionId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AccountEntity_sessionId` ON `${TABLE_NAME}` (`sessionId`)"
+          },
+          {
+            "name": "index_AccountEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AccountEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "SessionEntity",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "sessionId"
+            ],
+            "referencedColumns": [
+              "sessionId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AccountMetadataEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `product` TEXT NOT NULL, `primaryAtUtc` INTEGER NOT NULL, `migrations` TEXT, PRIMARY KEY(`userId`, `product`), FOREIGN KEY(`userId`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "product",
+            "columnName": "product",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryAtUtc",
+            "columnName": "primaryAtUtc",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "migrations",
+            "columnName": "migrations",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "product"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AccountMetadataEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AccountMetadataEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_AccountMetadataEntity_product",
+            "unique": false,
+            "columnNames": [
+              "product"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AccountMetadataEntity_product` ON `${TABLE_NAME}` (`product`)"
+          },
+          {
+            "name": "index_AccountMetadataEntity_primaryAtUtc",
+            "unique": false,
+            "columnNames": [
+              "primaryAtUtc"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AccountMetadataEntity_primaryAtUtc` ON `${TABLE_NAME}` (`primaryAtUtc`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SessionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT, `sessionId` TEXT NOT NULL, `accessToken` TEXT NOT NULL, `refreshToken` TEXT NOT NULL, `scopes` TEXT NOT NULL, `product` TEXT NOT NULL, PRIMARY KEY(`sessionId`), FOREIGN KEY(`userId`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "sessionId",
+            "columnName": "sessionId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accessToken",
+            "columnName": "accessToken",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refreshToken",
+            "columnName": "refreshToken",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scopes",
+            "columnName": "scopes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "product",
+            "columnName": "product",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "sessionId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_SessionEntity_sessionId",
+            "unique": false,
+            "columnNames": [
+              "sessionId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SessionEntity_sessionId` ON `${TABLE_NAME}` (`sessionId`)"
+          },
+          {
+            "name": "index_SessionEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SessionEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SessionDetailsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`sessionId` TEXT NOT NULL, `initialEventId` TEXT, `requiredAccountType` TEXT NOT NULL, `secondFactorEnabled` INTEGER NOT NULL, `twoPassModeEnabled` INTEGER NOT NULL, `passphrase` BLOB, `password` TEXT, `fido2AuthenticationOptionsJson` TEXT, PRIMARY KEY(`sessionId`), FOREIGN KEY(`sessionId`) REFERENCES `SessionEntity`(`sessionId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "sessionId",
+            "columnName": "sessionId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "initialEventId",
+            "columnName": "initialEventId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "requiredAccountType",
+            "columnName": "requiredAccountType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondFactorEnabled",
+            "columnName": "secondFactorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "twoPassModeEnabled",
+            "columnName": "twoPassModeEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "passphrase",
+            "columnName": "passphrase",
+            "affinity": "BLOB"
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "fido2AuthenticationOptionsJson",
+            "columnName": "fido2AuthenticationOptionsJson",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "sessionId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_SessionDetailsEntity_sessionId",
+            "unique": false,
+            "columnNames": [
+              "sessionId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SessionDetailsEntity_sessionId` ON `${TABLE_NAME}` (`sessionId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "SessionEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "sessionId"
+            ],
+            "referencedColumns": [
+              "sessionId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UserEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `email` TEXT, `name` TEXT, `displayName` TEXT, `currency` TEXT NOT NULL, `credit` INTEGER NOT NULL, `createdAtUtc` INTEGER NOT NULL, `usedSpace` INTEGER NOT NULL, `maxSpace` INTEGER NOT NULL, `maxUpload` INTEGER NOT NULL, `type` INTEGER, `role` INTEGER, `private` INTEGER NOT NULL, `subscribed` INTEGER NOT NULL, `services` INTEGER NOT NULL, `delinquent` INTEGER, `passphrase` BLOB, `flags` TEXT, `maxBaseSpace` INTEGER, `maxDriveSpace` INTEGER, `usedBaseSpace` INTEGER, `usedDriveSpace` INTEGER, `recovery_state` INTEGER, `recovery_startTime` INTEGER, `recovery_endTime` INTEGER, `recovery_sessionId` TEXT, `recovery_reason` INTEGER, PRIMARY KEY(`userId`), FOREIGN KEY(`userId`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "credit",
+            "columnName": "credit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAtUtc",
+            "columnName": "createdAtUtc",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usedSpace",
+            "columnName": "usedSpace",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "maxSpace",
+            "columnName": "maxSpace",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "maxUpload",
+            "columnName": "maxUpload",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "isPrivate",
+            "columnName": "private",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subscribed",
+            "columnName": "subscribed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "services",
+            "columnName": "services",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "delinquent",
+            "columnName": "delinquent",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "passphrase",
+            "columnName": "passphrase",
+            "affinity": "BLOB"
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "maxBaseSpace",
+            "columnName": "maxBaseSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxDriveSpace",
+            "columnName": "maxDriveSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedBaseSpace",
+            "columnName": "usedBaseSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedDriveSpace",
+            "columnName": "usedDriveSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "recovery.state",
+            "columnName": "recovery_state",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "recovery.startTime",
+            "columnName": "recovery_startTime",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "recovery.endTime",
+            "columnName": "recovery_endTime",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "recovery.sessionId",
+            "columnName": "recovery_sessionId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "recovery.reason",
+            "columnName": "recovery_reason",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UserEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UserEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UserKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `keyId` TEXT NOT NULL, `version` INTEGER NOT NULL, `privateKey` TEXT NOT NULL, `isPrimary` INTEGER NOT NULL, `isUnlockable` INTEGER NOT NULL, `fingerprint` TEXT, `activation` TEXT, `active` INTEGER, `recoverySecretHash` TEXT, `recoverySecretSignature` TEXT, PRIMARY KEY(`keyId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyId",
+            "columnName": "keyId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "privateKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPrimary",
+            "columnName": "isPrimary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isUnlockable",
+            "columnName": "isUnlockable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fingerprint",
+            "columnName": "fingerprint",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "activation",
+            "columnName": "activation",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "active",
+            "columnName": "active",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "recoverySecretHash",
+            "columnName": "recoverySecretHash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "recoverySecretSignature",
+            "columnName": "recoverySecretSignature",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "keyId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UserKeyEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UserKeyEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_UserKeyEntity_keyId",
+            "unique": false,
+            "columnNames": [
+              "keyId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UserKeyEntity_keyId` ON `${TABLE_NAME}` (`keyId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddressEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `addressId` TEXT NOT NULL, `email` TEXT NOT NULL, `displayName` TEXT, `signature` TEXT, `domainId` TEXT, `canSend` INTEGER NOT NULL, `canReceive` INTEGER NOT NULL, `enabled` INTEGER NOT NULL, `type` INTEGER, `order` INTEGER NOT NULL, `signedKeyList_data` TEXT, `signedKeyList_signature` TEXT, `signedKeyList_minEpochId` INTEGER, `signedKeyList_maxEpochId` INTEGER, `signedKeyList_expectedMinEpochId` INTEGER, PRIMARY KEY(`addressId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addressId",
+            "columnName": "addressId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "signature",
+            "columnName": "signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "domainId",
+            "columnName": "domainId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "canSend",
+            "columnName": "canSend",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canReceive",
+            "columnName": "canReceive",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "enabled",
+            "columnName": "enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "order",
+            "columnName": "order",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "signedKeyList.data",
+            "columnName": "signedKeyList_data",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "signedKeyList.signature",
+            "columnName": "signedKeyList_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "signedKeyList.minEpochId",
+            "columnName": "signedKeyList_minEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "signedKeyList.maxEpochId",
+            "columnName": "signedKeyList_maxEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "signedKeyList.expectedMinEpochId",
+            "columnName": "signedKeyList_expectedMinEpochId",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "addressId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AddressEntity_addressId",
+            "unique": false,
+            "columnNames": [
+              "addressId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddressEntity_addressId` ON `${TABLE_NAME}` (`addressId`)"
+          },
+          {
+            "name": "index_AddressEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddressEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddressKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addressId` TEXT NOT NULL, `keyId` TEXT NOT NULL, `version` INTEGER NOT NULL, `privateKey` TEXT NOT NULL, `isPrimary` INTEGER NOT NULL, `isUnlockable` INTEGER NOT NULL, `flags` INTEGER NOT NULL, `passphrase` BLOB, `token` TEXT, `signature` TEXT, `fingerprint` TEXT, `fingerprints` TEXT, `activation` TEXT, `active` INTEGER NOT NULL, PRIMARY KEY(`keyId`), FOREIGN KEY(`addressId`) REFERENCES `AddressEntity`(`addressId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addressId",
+            "columnName": "addressId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyId",
+            "columnName": "keyId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "privateKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPrimary",
+            "columnName": "isPrimary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isUnlockable",
+            "columnName": "isUnlockable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "passphrase",
+            "columnName": "passphrase",
+            "affinity": "BLOB"
+          },
+          {
+            "fieldPath": "token",
+            "columnName": "token",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "signature",
+            "columnName": "signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "fingerprint",
+            "columnName": "fingerprint",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "fingerprints",
+            "columnName": "fingerprints",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "activation",
+            "columnName": "activation",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "active",
+            "columnName": "active",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "keyId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AddressKeyEntity_addressId",
+            "unique": false,
+            "columnNames": [
+              "addressId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddressKeyEntity_addressId` ON `${TABLE_NAME}` (`addressId`)"
+          },
+          {
+            "name": "index_AddressKeyEntity_keyId",
+            "unique": false,
+            "columnNames": [
+              "keyId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddressKeyEntity_keyId` ON `${TABLE_NAME}` (`keyId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddressEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addressId"
+            ],
+            "referencedColumns": [
+              "addressId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "KeySaltEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `keyId` TEXT NOT NULL, `keySalt` TEXT, PRIMARY KEY(`userId`, `keyId`))",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyId",
+            "columnName": "keyId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keySalt",
+            "columnName": "keySalt",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "keyId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_KeySaltEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_KeySaltEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_KeySaltEntity_keyId",
+            "unique": false,
+            "columnNames": [
+              "keyId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_KeySaltEntity_keyId` ON `${TABLE_NAME}` (`keyId`)"
+          }
+        ]
+      },
+      {
+        "tableName": "PublicAddressEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `recipientType` INTEGER NOT NULL, `mimeType` TEXT, `ignoreKT` INTEGER, `signedKeyList_data` TEXT, `signedKeyList_signature` TEXT, `signedKeyList_minEpochId` INTEGER, `signedKeyList_maxEpochId` INTEGER, `signedKeyList_expectedMinEpochId` INTEGER, PRIMARY KEY(`email`))",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recipientType",
+            "columnName": "recipientType",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mimeType",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "ignoreKT",
+            "columnName": "ignoreKT",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "signedKeyListEntity.data",
+            "columnName": "signedKeyList_data",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "signedKeyListEntity.signature",
+            "columnName": "signedKeyList_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "signedKeyListEntity.minEpochId",
+            "columnName": "signedKeyList_minEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "signedKeyListEntity.maxEpochId",
+            "columnName": "signedKeyList_maxEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "signedKeyListEntity.expectedMinEpochId",
+            "columnName": "signedKeyList_expectedMinEpochId",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "email"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PublicAddressEntity_email",
+            "unique": false,
+            "columnNames": [
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PublicAddressEntity_email` ON `${TABLE_NAME}` (`email`)"
+          }
+        ]
+      },
+      {
+        "tableName": "PublicAddressKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `flags` INTEGER NOT NULL, `publicKey` TEXT NOT NULL, `isPrimary` INTEGER NOT NULL, PRIMARY KEY(`email`, `publicKey`), FOREIGN KEY(`email`) REFERENCES `PublicAddressEntity`(`email`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicKey",
+            "columnName": "publicKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPrimary",
+            "columnName": "isPrimary",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "email",
+            "publicKey"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PublicAddressKeyEntity_email",
+            "unique": false,
+            "columnNames": [
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PublicAddressKeyEntity_email` ON `${TABLE_NAME}` (`email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "PublicAddressEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "email"
+            ],
+            "referencedColumns": [
+              "email"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "HumanVerificationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`clientId` TEXT NOT NULL, `clientIdType` TEXT NOT NULL, `verificationMethods` TEXT NOT NULL, `verificationToken` TEXT, `state` TEXT NOT NULL, `humanHeaderTokenType` TEXT, `humanHeaderTokenCode` TEXT, PRIMARY KEY(`clientId`))",
+        "fields": [
+          {
+            "fieldPath": "clientId",
+            "columnName": "clientId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clientIdType",
+            "columnName": "clientIdType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "verificationMethods",
+            "columnName": "verificationMethods",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "verificationToken",
+            "columnName": "verificationToken",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "humanHeaderTokenType",
+            "columnName": "humanHeaderTokenType",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "humanHeaderTokenCode",
+            "columnName": "humanHeaderTokenCode",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "clientId"
+          ]
+        }
+      },
+      {
+        "tableName": "UserSettingsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `news` INTEGER, `locale` TEXT, `logAuth` INTEGER, `density` INTEGER, `weekStart` INTEGER, `dateFormat` INTEGER, `timeFormat` INTEGER, `earlyAccess` INTEGER, `deviceRecovery` INTEGER, `telemetry` INTEGER, `crashReports` INTEGER, `sessionAccountRecovery` INTEGER, `easyDeviceMigrationOptOut` INTEGER, `email_value` TEXT, `email_status` INTEGER, `email_notify` INTEGER, `email_reset` INTEGER, `phone_value` TEXT, `phone_status` INTEGER, `phone_notify` INTEGER, `phone_reset` INTEGER, `password_mode` INTEGER, `password_expirationTime` INTEGER, `twoFA_enabled` INTEGER, `twoFA_allowed` INTEGER, `twoFA_expirationTime` INTEGER, `twoFA_registeredKeys` TEXT, PRIMARY KEY(`userId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "news",
+            "columnName": "news",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "logAuth",
+            "columnName": "logAuth",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "density",
+            "columnName": "density",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "weekStart",
+            "columnName": "weekStart",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "dateFormat",
+            "columnName": "dateFormat",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "timeFormat",
+            "columnName": "timeFormat",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "earlyAccess",
+            "columnName": "earlyAccess",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "deviceRecovery",
+            "columnName": "deviceRecovery",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "telemetry",
+            "columnName": "telemetry",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "crashReports",
+            "columnName": "crashReports",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "sessionAccountRecovery",
+            "columnName": "sessionAccountRecovery",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "easyDeviceMigrationOptOut",
+            "columnName": "easyDeviceMigrationOptOut",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "email.value",
+            "columnName": "email_value",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "email.status",
+            "columnName": "email_status",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "email.notify",
+            "columnName": "email_notify",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "email.reset",
+            "columnName": "email_reset",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "phone.value",
+            "columnName": "phone_value",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "phone.status",
+            "columnName": "phone_status",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "phone.notify",
+            "columnName": "phone_notify",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "phone.reset",
+            "columnName": "phone_reset",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "password.mode",
+            "columnName": "password_mode",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "password.expirationTime",
+            "columnName": "password_expirationTime",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "twoFA.enabled",
+            "columnName": "twoFA_enabled",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "twoFA.allowed",
+            "columnName": "twoFA_allowed",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "twoFA.expirationTime",
+            "columnName": "twoFA_expirationTime",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "twoFA.registeredKeys",
+            "columnName": "twoFA_registeredKeys",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "EntitlementEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, PRIMARY KEY(`user_id`, `key`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "key"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_EntitlementEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_EntitlementEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "OrganizationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `name` TEXT NOT NULL, `displayName` TEXT, `planName` TEXT, `twoFactorGracePeriod` INTEGER, `theme` TEXT, `email` TEXT, `maxDomains` INTEGER, `maxAddresses` INTEGER, `maxSpace` INTEGER, `maxMembers` INTEGER, `maxVPN` INTEGER, `maxCalendars` INTEGER, `features` INTEGER, `flags` INTEGER, `usedDomains` INTEGER, `usedAddresses` INTEGER, `usedSpace` INTEGER, `assignedSpace` INTEGER, `usedMembers` INTEGER, `usedVPN` INTEGER, `usedCalendars` INTEGER, `hasKeys` INTEGER, `toMigrate` INTEGER, PRIMARY KEY(`userId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "planName",
+            "columnName": "planName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "twoFactorGracePeriod",
+            "columnName": "twoFactorGracePeriod",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "theme",
+            "columnName": "theme",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "maxDomains",
+            "columnName": "maxDomains",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxAddresses",
+            "columnName": "maxAddresses",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxSpace",
+            "columnName": "maxSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxMembers",
+            "columnName": "maxMembers",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxVPN",
+            "columnName": "maxVPN",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxCalendars",
+            "columnName": "maxCalendars",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "features",
+            "columnName": "features",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedDomains",
+            "columnName": "usedDomains",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedAddresses",
+            "columnName": "usedAddresses",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedSpace",
+            "columnName": "usedSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "assignedSpace",
+            "columnName": "assignedSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedMembers",
+            "columnName": "usedMembers",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedVPN",
+            "columnName": "usedVPN",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedCalendars",
+            "columnName": "usedCalendars",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "hasKeys",
+            "columnName": "hasKeys",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "toMigrate",
+            "columnName": "toMigrate",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "OrganizationKeysEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `publicKey` TEXT NOT NULL, `privateKey` TEXT NOT NULL, PRIMARY KEY(`userId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicKey",
+            "columnName": "publicKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "privateKey",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "EventMetadataEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `config` TEXT NOT NULL, `eventId` TEXT, `nextEventId` TEXT, `refresh` TEXT, `more` INTEGER, `retry` INTEGER NOT NULL, `state` TEXT NOT NULL, `createdAt` INTEGER NOT NULL, `updatedAt` INTEGER, `fetchedAt` INTEGER, PRIMARY KEY(`userId`, `config`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "config",
+            "columnName": "config",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "eventId",
+            "columnName": "eventId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "nextEventId",
+            "columnName": "nextEventId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "refresh",
+            "columnName": "refresh",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "more",
+            "columnName": "more",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "retry",
+            "columnName": "retry",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "updatedAt",
+            "columnName": "updatedAt",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "fetchedAt",
+            "columnName": "fetchedAt",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "config"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_EventMetadataEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_EventMetadataEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_EventMetadataEntity_config",
+            "unique": false,
+            "columnNames": [
+              "config"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_EventMetadataEntity_config` ON `${TABLE_NAME}` (`config`)"
+          },
+          {
+            "name": "index_EventMetadataEntity_createdAt",
+            "unique": false,
+            "columnNames": [
+              "createdAt"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_EventMetadataEntity_createdAt` ON `${TABLE_NAME}` (`createdAt`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "FeatureFlagEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `featureId` TEXT NOT NULL, `scope` TEXT NOT NULL, `defaultValue` INTEGER NOT NULL, `value` INTEGER NOT NULL, `variantName` TEXT, `payloadType` TEXT, `payloadValue` TEXT, PRIMARY KEY(`userId`, `featureId`))",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "featureId",
+            "columnName": "featureId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scope",
+            "columnName": "scope",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "defaultValue",
+            "columnName": "defaultValue",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "variantName",
+            "columnName": "variantName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "payloadType",
+            "columnName": "payloadType",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "payloadValue",
+            "columnName": "payloadValue",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "featureId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_FeatureFlagEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_FeatureFlagEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_FeatureFlagEntity_featureId",
+            "unique": false,
+            "columnNames": [
+              "featureId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_FeatureFlagEntity_featureId` ON `${TABLE_NAME}` (`featureId`)"
+          }
+        ]
+      },
+      {
+        "tableName": "ChallengeFrameEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`challengeFrame` TEXT NOT NULL, `flow` TEXT NOT NULL, `focusTime` TEXT NOT NULL, `clicks` INTEGER NOT NULL, `copy` TEXT NOT NULL, `paste` TEXT NOT NULL, `keys` TEXT NOT NULL, PRIMARY KEY(`challengeFrame`))",
+        "fields": [
+          {
+            "fieldPath": "challengeFrame",
+            "columnName": "challengeFrame",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "flow",
+            "columnName": "flow",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "focusTime",
+            "columnName": "focusTime",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "copy",
+            "columnName": "copy",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paste",
+            "columnName": "paste",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keys",
+            "columnName": "keys",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "challengeFrame"
+          ]
+        }
+      },
+      {
+        "tableName": "PurchaseEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`sessionId` TEXT NOT NULL, `planName` TEXT NOT NULL, `planCycle` INTEGER NOT NULL, `purchaseState` TEXT NOT NULL, `purchaseFailure` TEXT, `paymentProvider` TEXT NOT NULL, `paymentOrderId` TEXT, `paymentToken` TEXT, `paymentCurrency` TEXT NOT NULL, `paymentAmount` INTEGER NOT NULL, PRIMARY KEY(`planName`), FOREIGN KEY(`sessionId`) REFERENCES `SessionEntity`(`sessionId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "sessionId",
+            "columnName": "sessionId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "planName",
+            "columnName": "planName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "planCycle",
+            "columnName": "planCycle",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "purchaseState",
+            "columnName": "purchaseState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "purchaseFailure",
+            "columnName": "purchaseFailure",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "paymentProvider",
+            "columnName": "paymentProvider",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentOrderId",
+            "columnName": "paymentOrderId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "paymentToken",
+            "columnName": "paymentToken",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "paymentCurrency",
+            "columnName": "paymentCurrency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentAmount",
+            "columnName": "paymentAmount",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "planName"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PurchaseEntity_planName",
+            "unique": false,
+            "columnNames": [
+              "planName"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PurchaseEntity_planName` ON `${TABLE_NAME}` (`planName`)"
+          },
+          {
+            "name": "index_PurchaseEntity_sessionId",
+            "unique": false,
+            "columnNames": [
+              "sessionId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PurchaseEntity_sessionId` ON `${TABLE_NAME}` (`sessionId`)"
+          },
+          {
+            "name": "index_PurchaseEntity_purchaseState",
+            "unique": false,
+            "columnNames": [
+              "purchaseState"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PurchaseEntity_purchaseState` ON `${TABLE_NAME}` (`purchaseState`)"
+          },
+          {
+            "name": "index_PurchaseEntity_paymentProvider",
+            "unique": false,
+            "columnNames": [
+              "paymentProvider"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PurchaseEntity_paymentProvider` ON `${TABLE_NAME}` (`paymentProvider`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "SessionEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "sessionId"
+            ],
+            "referencedColumns": [
+              "sessionId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GooglePurchaseEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`googlePurchaseToken` TEXT NOT NULL, `paymentToken` TEXT NOT NULL, PRIMARY KEY(`googlePurchaseToken`))",
+        "fields": [
+          {
+            "fieldPath": "googlePurchaseToken",
+            "columnName": "googlePurchaseToken",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentToken",
+            "columnName": "paymentToken",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "googlePurchaseToken"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_GooglePurchaseEntity_paymentToken",
+            "unique": true,
+            "columnNames": [
+              "paymentToken"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_GooglePurchaseEntity_paymentToken` ON `${TABLE_NAME}` (`paymentToken`)"
+          }
+        ]
+      },
+      {
+        "tableName": "ObservabilityEventEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `version` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `data` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "AddressChangeEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `changeId` TEXT NOT NULL, `counterEncrypted` TEXT NOT NULL, `emailEncrypted` TEXT NOT NULL, `epochIdEncrypted` TEXT NOT NULL, `creationTimestampEncrypted` TEXT NOT NULL, `publicKeysEncrypted` TEXT NOT NULL, `isObsolete` TEXT NOT NULL, PRIMARY KEY(`userId`, `changeId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changeId",
+            "columnName": "changeId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "counterEncrypted",
+            "columnName": "counterEncrypted",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "emailEncrypted",
+            "columnName": "emailEncrypted",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "epochIdEncrypted",
+            "columnName": "epochIdEncrypted",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creationTimestampEncrypted",
+            "columnName": "creationTimestampEncrypted",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicKeysEncrypted",
+            "columnName": "publicKeysEncrypted",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isObsolete",
+            "columnName": "isObsolete",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "changeId"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SelfAuditResultEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`userId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "NotificationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`notificationId` TEXT NOT NULL, `userId` TEXT NOT NULL, `time` INTEGER NOT NULL, `type` TEXT NOT NULL, `payload` TEXT NOT NULL, PRIMARY KEY(`userId`, `notificationId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "notificationId",
+            "columnName": "notificationId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "time",
+            "columnName": "time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "payload",
+            "columnName": "payload",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "notificationId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_NotificationEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_NotificationEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_NotificationEntity_notificationId",
+            "unique": false,
+            "columnNames": [
+              "notificationId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_NotificationEntity_notificationId` ON `${TABLE_NAME}` (`notificationId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PushEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `pushId` TEXT NOT NULL, `objectId` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`userId`, `pushId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pushId",
+            "columnName": "pushId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "objectId",
+            "columnName": "objectId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "pushId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PushEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PushEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_PushEntity_type",
+            "unique": false,
+            "columnNames": [
+              "type"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PushEntity_type` ON `${TABLE_NAME}` (`type`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TelemetryEventEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` TEXT, `group` TEXT NOT NULL, `name` TEXT NOT NULL, `values` TEXT NOT NULL, `dimensions` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "values",
+            "columnName": "values",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dimensions",
+            "columnName": "dimensions",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TelemetryEventEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TelemetryEventEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ContactCardEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`contactId` TEXT NOT NULL, `type` INTEGER NOT NULL, `data` TEXT NOT NULL, `signature` TEXT, `cardId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, FOREIGN KEY(`contactId`) REFERENCES `ContactEntity`(`contactId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "contactId",
+            "columnName": "contactId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "signature",
+            "columnName": "signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "cardId",
+            "columnName": "cardId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "cardId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ContactCardEntity_contactId",
+            "unique": false,
+            "columnNames": [
+              "contactId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ContactCardEntity_contactId` ON `${TABLE_NAME}` (`contactId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "ContactEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "contactId"
+            ],
+            "referencedColumns": [
+              "contactId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ContactEmailEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `contactEmailId` TEXT NOT NULL, `name` TEXT NOT NULL, `email` TEXT NOT NULL, `defaults` INTEGER NOT NULL, `order` INTEGER NOT NULL, `contactId` TEXT NOT NULL, `canonicalEmail` TEXT, `isProton` INTEGER, `lastUsedTime` INTEGER NOT NULL, PRIMARY KEY(`contactEmailId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`contactId`) REFERENCES `ContactEntity`(`contactId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contactEmailId",
+            "columnName": "contactEmailId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "defaults",
+            "columnName": "defaults",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "order",
+            "columnName": "order",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contactId",
+            "columnName": "contactId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canonicalEmail",
+            "columnName": "canonicalEmail",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isProton",
+            "columnName": "isProton",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastUsedTime",
+            "columnName": "lastUsedTime",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "contactEmailId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ContactEmailEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ContactEmailEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_ContactEmailEntity_contactId",
+            "unique": false,
+            "columnNames": [
+              "contactId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ContactEmailEntity_contactId` ON `${TABLE_NAME}` (`contactId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ContactEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "contactId"
+            ],
+            "referencedColumns": [
+              "contactId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ContactEmailLabelEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`contactEmailId` TEXT NOT NULL, `labelId` TEXT NOT NULL, PRIMARY KEY(`contactEmailId`, `labelId`), FOREIGN KEY(`contactEmailId`) REFERENCES `ContactEmailEntity`(`contactEmailId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "contactEmailId",
+            "columnName": "contactEmailId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "labelId",
+            "columnName": "labelId",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "contactEmailId",
+            "labelId"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "ContactEmailEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "contactEmailId"
+            ],
+            "referencedColumns": [
+              "contactEmailId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ContactEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `contactId` TEXT NOT NULL, `name` TEXT NOT NULL, PRIMARY KEY(`contactId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contactId",
+            "columnName": "contactId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "contactId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ContactEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ContactEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "RecoveryFileEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `createdAtUtcMillis` INTEGER NOT NULL, `keyCount` INTEGER, `recoveryFile` TEXT NOT NULL, `recoverySecretHash` TEXT NOT NULL, PRIMARY KEY(`recoverySecretHash`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAtUtcMillis",
+            "columnName": "createdAtUtcMillis",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyCount",
+            "columnName": "keyCount",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "recoveryFile",
+            "columnName": "recoveryFile",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recoverySecretHash",
+            "columnName": "recoverySecretHash",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "recoverySecretHash"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_RecoveryFileEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RecoveryFileEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PublicAddressInfoEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `warnings` TEXT NOT NULL, `protonMx` INTEGER NOT NULL, `isProton` INTEGER NOT NULL, `addressSignedKeyList_data` TEXT, `addressSignedKeyList_signature` TEXT, `addressSignedKeyList_minEpochId` INTEGER, `addressSignedKeyList_maxEpochId` INTEGER, `addressSignedKeyList_expectedMinEpochId` INTEGER, `catchAllSignedKeyList_data` TEXT, `catchAllSignedKeyList_signature` TEXT, `catchAllSignedKeyList_minEpochId` INTEGER, `catchAllSignedKeyList_maxEpochId` INTEGER, `catchAllSignedKeyList_expectedMinEpochId` INTEGER, PRIMARY KEY(`email`))",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "warnings",
+            "columnName": "warnings",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "protonMx",
+            "columnName": "protonMx",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isProton",
+            "columnName": "isProton",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addressSignedKeyList.data",
+            "columnName": "addressSignedKeyList_data",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "addressSignedKeyList.signature",
+            "columnName": "addressSignedKeyList_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "addressSignedKeyList.minEpochId",
+            "columnName": "addressSignedKeyList_minEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "addressSignedKeyList.maxEpochId",
+            "columnName": "addressSignedKeyList_maxEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "addressSignedKeyList.expectedMinEpochId",
+            "columnName": "addressSignedKeyList_expectedMinEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "catchAllSignedKeyList.data",
+            "columnName": "catchAllSignedKeyList_data",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "catchAllSignedKeyList.signature",
+            "columnName": "catchAllSignedKeyList_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "catchAllSignedKeyList.minEpochId",
+            "columnName": "catchAllSignedKeyList_minEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "catchAllSignedKeyList.maxEpochId",
+            "columnName": "catchAllSignedKeyList_maxEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "catchAllSignedKeyList.expectedMinEpochId",
+            "columnName": "catchAllSignedKeyList_expectedMinEpochId",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "email"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PublicAddressInfoEntity_email",
+            "unique": false,
+            "columnNames": [
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PublicAddressInfoEntity_email` ON `${TABLE_NAME}` (`email`)"
+          }
+        ]
+      },
+      {
+        "tableName": "PublicAddressKeyDataEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `emailAddressType` INTEGER NOT NULL, `flags` INTEGER NOT NULL, `publicKey` TEXT NOT NULL, `isPrimary` INTEGER NOT NULL, `source` INTEGER, PRIMARY KEY(`email`, `publicKey`), FOREIGN KEY(`email`) REFERENCES `PublicAddressInfoEntity`(`email`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "emailAddressType",
+            "columnName": "emailAddressType",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicKey",
+            "columnName": "publicKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPrimary",
+            "columnName": "isPrimary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "email",
+            "publicKey"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PublicAddressKeyDataEntity_email",
+            "unique": false,
+            "columnNames": [
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PublicAddressKeyDataEntity_email` ON `${TABLE_NAME}` (`email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "PublicAddressInfoEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "email"
+            ],
+            "referencedColumns": [
+              "email"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LabelEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `labelId` TEXT NOT NULL, `parentId` TEXT, `name` TEXT NOT NULL, `type` INTEGER NOT NULL, `path` TEXT NOT NULL, `color` TEXT NOT NULL, `order` INTEGER NOT NULL, `isNotified` INTEGER, `isExpanded` INTEGER, `isSticky` INTEGER, PRIMARY KEY(`userId`, `labelId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "labelId",
+            "columnName": "labelId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "path",
+            "columnName": "path",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "order",
+            "columnName": "order",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "isNotified",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "isExpanded",
+            "columnName": "isExpanded",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "isSticky",
+            "columnName": "isSticky",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "labelId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LabelEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LabelEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_LabelEntity_labelId",
+            "unique": false,
+            "columnNames": [
+              "labelId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LabelEntity_labelId` ON `${TABLE_NAME}` (`labelId`)"
+          },
+          {
+            "name": "index_LabelEntity_parentId",
+            "unique": false,
+            "columnNames": [
+              "parentId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LabelEntity_parentId` ON `${TABLE_NAME}` (`parentId`)"
+          },
+          {
+            "name": "index_LabelEntity_name",
+            "unique": false,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LabelEntity_name` ON `${TABLE_NAME}` (`name`)"
+          },
+          {
+            "name": "index_LabelEntity_type",
+            "unique": false,
+            "columnNames": [
+              "type"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LabelEntity_type` ON `${TABLE_NAME}` (`type`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AuthDeviceEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `deviceId` TEXT NOT NULL, `addressId` TEXT, `state` INTEGER NOT NULL, `name` TEXT NOT NULL, `localizedClientName` TEXT NOT NULL, `platform` TEXT, `createdAtUtcSeconds` INTEGER NOT NULL, `activatedAtUtcSeconds` INTEGER, `rejectedAtUtcSeconds` INTEGER, `activationToken` TEXT, `lastActivityAtUtcSeconds` INTEGER NOT NULL, PRIMARY KEY(`userId`, `deviceId`), FOREIGN KEY(`userId`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "deviceId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addressId",
+            "columnName": "addressId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localizedClientName",
+            "columnName": "localizedClientName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "platform",
+            "columnName": "platform",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "createdAtUtcSeconds",
+            "columnName": "createdAtUtcSeconds",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activatedAtUtcSeconds",
+            "columnName": "activatedAtUtcSeconds",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "rejectedAtUtcSeconds",
+            "columnName": "rejectedAtUtcSeconds",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "activationToken",
+            "columnName": "activationToken",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "lastActivityAtUtcSeconds",
+            "columnName": "lastActivityAtUtcSeconds",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "deviceId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AuthDeviceEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AuthDeviceEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_AuthDeviceEntity_addressId",
+            "unique": false,
+            "columnNames": [
+              "addressId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AuthDeviceEntity_addressId` ON `${TABLE_NAME}` (`addressId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DeviceSecretEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `deviceId` TEXT NOT NULL, `secret` TEXT NOT NULL, `token` TEXT NOT NULL, PRIMARY KEY(`userId`), FOREIGN KEY(`userId`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "deviceId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secret",
+            "columnName": "secret",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "token",
+            "columnName": "token",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_DeviceSecretEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceSecretEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "MemberDeviceEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `deviceId` TEXT NOT NULL, `memberId` TEXT NOT NULL, `addressId` TEXT, `state` INTEGER NOT NULL, `name` TEXT NOT NULL, `localizedClientName` TEXT NOT NULL, `platform` TEXT, `createdAtUtcSeconds` INTEGER NOT NULL, `activatedAtUtcSeconds` INTEGER, `rejectedAtUtcSeconds` INTEGER, `activationToken` TEXT, `lastActivityAtUtcSeconds` INTEGER NOT NULL, PRIMARY KEY(`userId`, `deviceId`), FOREIGN KEY(`userId`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "deviceId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "memberId",
+            "columnName": "memberId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addressId",
+            "columnName": "addressId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localizedClientName",
+            "columnName": "localizedClientName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "platform",
+            "columnName": "platform",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "createdAtUtcSeconds",
+            "columnName": "createdAtUtcSeconds",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activatedAtUtcSeconds",
+            "columnName": "activatedAtUtcSeconds",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "rejectedAtUtcSeconds",
+            "columnName": "rejectedAtUtcSeconds",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "activationToken",
+            "columnName": "activationToken",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "lastActivityAtUtcSeconds",
+            "columnName": "lastActivityAtUtcSeconds",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "deviceId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_MemberDeviceEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_MemberDeviceEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_MemberDeviceEntity_memberId",
+            "unique": false,
+            "columnNames": [
+              "memberId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_MemberDeviceEntity_memberId` ON `${TABLE_NAME}` (`memberId`)"
+          },
+          {
+            "name": "index_MemberDeviceEntity_addressId",
+            "unique": false,
+            "columnNames": [
+              "addressId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_MemberDeviceEntity_addressId` ON `${TABLE_NAME}` (`addressId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "VolumeEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `create_time` INTEGER NOT NULL, `used_space` INTEGER NOT NULL, `state` INTEGER NOT NULL, `type` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usedSpace",
+            "columnName": "used_space",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_VolumeEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_VolumeEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_VolumeEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_VolumeEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_VolumeEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_VolumeEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_VolumeEntity_type",
+            "unique": false,
+            "columnNames": [
+              "type"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_VolumeEntity_type` ON `${TABLE_NAME}` (`type`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ShareEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `volume_type` INTEGER, `address_id` TEXT, `flags` INTEGER NOT NULL, `link_id` TEXT NOT NULL, `locked` INTEGER NOT NULL, `key` TEXT NOT NULL, `passphrase` TEXT NOT NULL, `passphrase_signature` TEXT NOT NULL, `creation_time` INTEGER, `type` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeType",
+            "columnName": "volume_type",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "addressId",
+            "columnName": "address_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isLocked",
+            "columnName": "locked",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "passphrase",
+            "columnName": "passphrase",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "passphraseSignature",
+            "columnName": "passphrase_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creationTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ShareEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_ShareEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_ShareEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_ShareEntity_id",
+            "unique": true,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ShareEntity_id` ON `${TABLE_NAME}` (`id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ShareUrlEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `flags` INTEGER NOT NULL, `name` TEXT, `token` TEXT NOT NULL, `creator_email` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `creation_time` INTEGER NOT NULL, `expiration_time` INTEGER, `last_access_time` INTEGER, `max_accesses` INTEGER, `number_of_accesses` INTEGER NOT NULL, `url_password_salt` TEXT NOT NULL, `share_password_salt` TEXT NOT NULL, `srp_verifier` TEXT NOT NULL, `srp_modulus_id` TEXT NOT NULL, `password` TEXT NOT NULL, `share_passphrase_key_packet` TEXT NOT NULL, `public_url` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "token",
+            "columnName": "token",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creatorEmail",
+            "columnName": "creator_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creationTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "expirationTime",
+            "columnName": "expiration_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastAccessTime",
+            "columnName": "last_access_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxAccesses",
+            "columnName": "max_accesses",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "numberOfAccesses",
+            "columnName": "number_of_accesses",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "urlPasswordSalt",
+            "columnName": "url_password_salt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharePasswordSalt",
+            "columnName": "share_password_salt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "srpVerifier",
+            "columnName": "srp_verifier",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "srpModulusId",
+            "columnName": "srp_modulus_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "encryptedUrlPassword",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharePassphraseKeyPacket",
+            "columnName": "share_passphrase_key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicUrl",
+            "columnName": "public_url",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ShareUrlEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareUrlEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_ShareUrlEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareUrlEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_ShareUrlEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareUrlEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_ShareUrlEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareUrlEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ShareExternalInvitationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `inviter_email` TEXT NOT NULL, `invitee_email` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `signature` TEXT NOT NULL, `state` INTEGER NOT NULL, `create_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviterEmail",
+            "columnName": "inviter_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviteeEmail",
+            "columnName": "invitee_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "signature",
+            "columnName": "signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ShareExternalInvitationEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareExternalInvitationEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_ShareExternalInvitationEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareExternalInvitationEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_ShareExternalInvitationEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareExternalInvitationEntity_id` ON `${TABLE_NAME}` (`id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ShareInvitationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `inviter_email` TEXT NOT NULL, `invitee_email` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `key_packet` TEXT NOT NULL, `key_packet_signature` TEXT NOT NULL, `create_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviterEmail",
+            "columnName": "inviter_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviteeEmail",
+            "columnName": "invitee_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacket",
+            "columnName": "key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacketSignature",
+            "columnName": "key_packet_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ShareInvitationEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareInvitationEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_ShareInvitationEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareInvitationEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_ShareInvitationEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareInvitationEntity_id` ON `${TABLE_NAME}` (`id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ShareMemberEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `inviter_email` TEXT NOT NULL, `invitee_email` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `key_packet` TEXT NOT NULL, `key_packet_signature` TEXT, `session_key_signature` TEXT, `create_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviterEmail",
+            "columnName": "inviter_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviteeEmail",
+            "columnName": "invitee_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacket",
+            "columnName": "key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacketSignature",
+            "columnName": "key_packet_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "sessionKeySignature",
+            "columnName": "session_key_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ShareMemberEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareMemberEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_ShareMemberEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareMemberEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_ShareMemberEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareMemberEntity_id` ON `${TABLE_NAME}` (`id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ShareMembershipEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `inviter_email` TEXT NOT NULL, `invitee_email` TEXT NOT NULL, `address_id` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `key_packet` TEXT NOT NULL, `key_packet_signature` TEXT, `session_key_signature` TEXT, `create_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviterEmail",
+            "columnName": "inviter_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviteeEmail",
+            "columnName": "invitee_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addressId",
+            "columnName": "address_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacket",
+            "columnName": "key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacketSignature",
+            "columnName": "key_packet_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "sessionKeySignature",
+            "columnName": "session_key_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ShareMembershipEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareMembershipEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_ShareMembershipEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareMembershipEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_ShareMembershipEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareMembershipEntity_id` ON `${TABLE_NAME}` (`id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UserInvitationDetailsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `id` TEXT NOT NULL, `inviter_email` TEXT NOT NULL, `invitee_email` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `key_packet` TEXT NOT NULL, `key_packet_signature` TEXT NOT NULL, `create_time` INTEGER NOT NULL, `passphrase` TEXT NOT NULL, `share_key` TEXT NOT NULL, `creator_email` TEXT NOT NULL, `type` INTEGER NOT NULL, `link_id` TEXT NOT NULL, `name` TEXT NOT NULL, `mime_type` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `id`) REFERENCES `UserInvitationIdEntity`(`user_id`, `volume_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviterEmail",
+            "columnName": "inviter_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviteeEmail",
+            "columnName": "invitee_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacket",
+            "columnName": "key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacketSignature",
+            "columnName": "key_packet_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "passphrase",
+            "columnName": "passphrase",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareKey",
+            "columnName": "share_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creatorEmail",
+            "columnName": "creator_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mime_type",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UserInvitationDetailsEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UserInvitationDetailsEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "UserInvitationIdEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UserInvitationIdEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `type` INTEGER, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UserInvitationIdEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UserInvitationIdEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `parent_id` TEXT, `type` INTEGER NOT NULL, `name` TEXT NOT NULL, `name_signature_email` TEXT, `hash` TEXT NOT NULL, `state` INTEGER NOT NULL, `expiration_time` INTEGER, `size` INTEGER NOT NULL, `mime_type` TEXT NOT NULL, `attributes` INTEGER NOT NULL, `permissions` INTEGER NOT NULL, `node_key` TEXT NOT NULL, `node_passphrase` TEXT NOT NULL, `node_passphrase_signature` TEXT NOT NULL, `signature_address` TEXT NOT NULL, `creation_time` INTEGER NOT NULL, `last_modified` INTEGER NOT NULL, `trashed_time` INTEGER, `is_shared` INTEGER NOT NULL, `number_of_accesses` INTEGER NOT NULL, `share_url_expiration_time` INTEGER, `x_attr` TEXT, `share_url_share_id` TEXT DEFAULT NULL, `share_url_id` TEXT DEFAULT NULL, PRIMARY KEY(`user_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nameSignatureEmail",
+            "columnName": "name_signature_email",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "expirationTime",
+            "columnName": "expiration_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mime_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attributes",
+            "columnName": "attributes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodeKey",
+            "columnName": "node_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodePassphrase",
+            "columnName": "node_passphrase",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodePassphraseSignature",
+            "columnName": "node_passphrase_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "signatureAddress",
+            "columnName": "signature_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creationTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastModified",
+            "columnName": "last_modified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "trashedTime",
+            "columnName": "trashed_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "shared",
+            "columnName": "is_shared",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "numberOfAccesses",
+            "columnName": "number_of_accesses",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareUrlExpirationTime",
+            "columnName": "share_url_expiration_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "xAttr",
+            "columnName": "x_attr",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "sharingDetailsShareId",
+            "columnName": "share_url_share_id",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "shareUrlId",
+            "columnName": "share_url_id",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_LinkEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_LinkEntity_parent_id",
+            "unique": false,
+            "columnNames": [
+              "parent_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_parent_id` ON `${TABLE_NAME}` (`parent_id`)"
+          },
+          {
+            "name": "index_LinkEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_LinkEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_LinkEntity_user_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_user_id_id` ON `${TABLE_NAME}` (`user_id`, `id`)"
+          },
+          {
+            "name": "index_LinkEntity_user_id_share_id_parent_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_user_id_share_id_parent_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `parent_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkFilePropertiesEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`file_user_id` TEXT NOT NULL, `file_share_id` TEXT NOT NULL, `file_link_id` TEXT NOT NULL, `revision_id` TEXT NOT NULL, `has_thumbnail` INTEGER NOT NULL, `content_key_packet` TEXT NOT NULL, `content_key_packet_signature` TEXT, `file_signature_address` TEXT, `capture_time` INTEGER DEFAULT NULL, `content_hash` TEXT DEFAULT NULL, `main_photo_link_id` TEXT DEFAULT NULL, `thumbnail_id_default` TEXT, `thumbnail_id_photo` TEXT, `checksum_verified` INTEGER NOT NULL, PRIMARY KEY(`file_user_id`, `file_share_id`, `file_link_id`), FOREIGN KEY(`file_user_id`, `file_share_id`, `file_link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "file_user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "file_share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "file_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeRevisionId",
+            "columnName": "revision_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasThumbnail",
+            "columnName": "has_thumbnail",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contentKeyPacket",
+            "columnName": "content_key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contentKeyPacketSignature",
+            "columnName": "content_key_packet_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "activeRevisionSignatureAddress",
+            "columnName": "file_signature_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photoCaptureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "photoContentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "mainPhotoLinkId",
+            "columnName": "main_photo_link_id",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "defaultThumbnailId",
+            "columnName": "thumbnail_id_default",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photoThumbnailId",
+            "columnName": "thumbnail_id_photo",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "activeRevisionChecksumVerified",
+            "columnName": "checksum_verified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "file_user_id",
+            "file_share_id",
+            "file_link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkFilePropertiesEntity_file_share_id",
+            "unique": false,
+            "columnNames": [
+              "file_share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFilePropertiesEntity_file_share_id` ON `${TABLE_NAME}` (`file_share_id`)"
+          },
+          {
+            "name": "index_LinkFilePropertiesEntity_file_link_id",
+            "unique": false,
+            "columnNames": [
+              "file_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFilePropertiesEntity_file_link_id` ON `${TABLE_NAME}` (`file_link_id`)"
+          },
+          {
+            "name": "index_LinkFilePropertiesEntity_revision_id",
+            "unique": false,
+            "columnNames": [
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFilePropertiesEntity_revision_id` ON `${TABLE_NAME}` (`revision_id`)"
+          },
+          {
+            "name": "index_LinkFilePropertiesEntity_file_user_id_file_share_id_file_link_id",
+            "unique": false,
+            "columnNames": [
+              "file_user_id",
+              "file_share_id",
+              "file_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFilePropertiesEntity_file_user_id_file_share_id_file_link_id` ON `${TABLE_NAME}` (`file_user_id`, `file_share_id`, `file_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "file_user_id",
+              "file_share_id",
+              "file_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkFolderPropertiesEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`folder_user_id` TEXT NOT NULL, `folder_share_id` TEXT NOT NULL, `folder_link_id` TEXT NOT NULL, `node_hash_key` TEXT NOT NULL, PRIMARY KEY(`folder_user_id`, `folder_share_id`, `folder_link_id`), FOREIGN KEY(`folder_user_id`, `folder_share_id`, `folder_link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "folder_user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "folder_share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "folder_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodeHashKey",
+            "columnName": "node_hash_key",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "folder_user_id",
+            "folder_share_id",
+            "folder_link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkFolderPropertiesEntity_folder_share_id",
+            "unique": false,
+            "columnNames": [
+              "folder_share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFolderPropertiesEntity_folder_share_id` ON `${TABLE_NAME}` (`folder_share_id`)"
+          },
+          {
+            "name": "index_LinkFolderPropertiesEntity_folder_link_id",
+            "unique": false,
+            "columnNames": [
+              "folder_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFolderPropertiesEntity_folder_link_id` ON `${TABLE_NAME}` (`folder_link_id`)"
+          },
+          {
+            "name": "index_LinkFolderPropertiesEntity_folder_user_id_folder_share_id_folder_link_id",
+            "unique": false,
+            "columnNames": [
+              "folder_user_id",
+              "folder_share_id",
+              "folder_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFolderPropertiesEntity_folder_user_id_folder_share_id_folder_link_id` ON `${TABLE_NAME}` (`folder_user_id`, `folder_share_id`, `folder_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "folder_user_id",
+              "folder_share_id",
+              "folder_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkAlbumPropertiesEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`album_user_id` TEXT NOT NULL, `album_share_id` TEXT NOT NULL, `album_link_id` TEXT NOT NULL, `album_node_hash_key` TEXT NOT NULL, `locked` INTEGER NOT NULL, `last_activity_time` INTEGER NOT NULL, `count` INTEGER NOT NULL, `cover_link_id` TEXT, PRIMARY KEY(`album_user_id`, `album_share_id`, `album_link_id`), FOREIGN KEY(`album_user_id`, `album_share_id`, `album_link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "album_user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "album_share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "album_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodeHashKey",
+            "columnName": "album_node_hash_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locked",
+            "columnName": "locked",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastActivityTime",
+            "columnName": "last_activity_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "photoCount",
+            "columnName": "count",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "coverLinkId",
+            "columnName": "cover_link_id",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "album_user_id",
+            "album_share_id",
+            "album_link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkAlbumPropertiesEntity_album_share_id",
+            "unique": false,
+            "columnNames": [
+              "album_share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkAlbumPropertiesEntity_album_share_id` ON `${TABLE_NAME}` (`album_share_id`)"
+          },
+          {
+            "name": "index_LinkAlbumPropertiesEntity_album_link_id",
+            "unique": false,
+            "columnNames": [
+              "album_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkAlbumPropertiesEntity_album_link_id` ON `${TABLE_NAME}` (`album_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "album_user_id",
+              "album_share_id",
+              "album_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkTagEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag_user_id` TEXT NOT NULL, `tag_share_id` TEXT NOT NULL, `tag_link_id` TEXT NOT NULL, `tag` INTEGER NOT NULL, PRIMARY KEY(`tag_user_id`, `tag_share_id`, `tag_link_id`, `tag`), FOREIGN KEY(`tag_user_id`, `tag_share_id`, `tag_link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "tag_user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "tag_share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "tag_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "tag_user_id",
+            "tag_share_id",
+            "tag_link_id",
+            "tag"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkTagEntity_tag_share_id_tag_link_id",
+            "unique": false,
+            "columnNames": [
+              "tag_share_id",
+              "tag_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTagEntity_tag_share_id_tag_link_id` ON `${TABLE_NAME}` (`tag_share_id`, `tag_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "tag_user_id",
+              "tag_share_id",
+              "tag_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkOfflineEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkOfflineEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkOfflineEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_LinkOfflineEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkOfflineEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_LinkOfflineEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkOfflineEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_LinkOfflineEntity_user_id_share_id_link_id",
+            "unique": true,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_LinkOfflineEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkDownloadStateEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `revision_id` TEXT NOT NULL, `state` TEXT NOT NULL, `manifest_signature` TEXT DEFAULT NULL, `signature_address` TEXT DEFAULT NULL, PRIMARY KEY(`user_id`, `share_id`, `link_id`, `revision_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "revisionId",
+            "columnName": "revision_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "manifestSignature",
+            "columnName": "manifest_signature",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "signatureAddress",
+            "columnName": "signature_address",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id",
+            "revision_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkDownloadStateEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_revision_id",
+            "unique": false,
+            "columnNames": [
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_revision_id` ON `${TABLE_NAME}` (`revision_id`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_state",
+            "unique": false,
+            "columnNames": [
+              "state"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_state` ON `${TABLE_NAME}` (`state`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_user_id_state",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "state"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_user_id_state` ON `${TABLE_NAME}` (`user_id`, `state`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_user_id_share_id_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_user_id_share_id_link_id_revision_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id",
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_user_id_share_id_link_id_revision_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`, `revision_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkDownloadFileSignatureVerificationFailedEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DownloadBlockEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `revision_id` TEXT NOT NULL, `index` INTEGER NOT NULL, `uri` TEXT NOT NULL, `encrypted_signature` TEXT, PRIMARY KEY(`user_id`, `share_id`, `link_id`, `revision_id`, `index`), FOREIGN KEY(`user_id`, `share_id`, `link_id`, `revision_id`) REFERENCES `LinkDownloadStateEntity`(`user_id`, `share_id`, `link_id`, `revision_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "revisionId",
+            "columnName": "revision_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "index",
+            "columnName": "index",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uri",
+            "columnName": "uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "encryptedSignature",
+            "columnName": "encrypted_signature",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id",
+            "revision_id",
+            "index"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_DownloadBlockEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DownloadBlockEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_DownloadBlockEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DownloadBlockEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_DownloadBlockEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DownloadBlockEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_DownloadBlockEntity_revision_id",
+            "unique": false,
+            "columnNames": [
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DownloadBlockEntity_revision_id` ON `${TABLE_NAME}` (`revision_id`)"
+          },
+          {
+            "name": "index_DownloadBlockEntity_user_id_share_id_link_id_revision_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id",
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DownloadBlockEntity_user_id_share_id_link_id_revision_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`, `revision_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkDownloadStateEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id",
+              "revision_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "link_id",
+              "revision_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkTrashStateEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `state` TEXT NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkTrashStateEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTrashStateEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_LinkTrashStateEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTrashStateEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_LinkTrashStateEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTrashStateEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_LinkTrashStateEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTrashStateEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_LinkTrashStateEntity_state",
+            "unique": false,
+            "columnNames": [
+              "state"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTrashStateEntity_state` ON `${TABLE_NAME}` (`state`)"
+          },
+          {
+            "name": "index_LinkTrashStateEntity_user_id_share_id_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTrashStateEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "FileDownloadEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `link_id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `revision_id` TEXT NOT NULL, `priority` INTEGER NOT NULL, `retryable` INTEGER NOT NULL, `state` TEXT NOT NULL, `parent_id` TEXT, `number_of_retries` INTEGER NOT NULL, `run_at` INTEGER, `network_type` TEXT NOT NULL, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fileId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "revisionId",
+            "columnName": "revision_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "retryable",
+            "columnName": "retryable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "numberOfRetries",
+            "columnName": "number_of_retries",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastRunTimestamp",
+            "columnName": "run_at",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "networkType",
+            "columnName": "network_type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_FileDownloadEntity_user_id_volume_id_share_id_link_id_revision_id",
+            "unique": true,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "link_id",
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_FileDownloadEntity_user_id_volume_id_share_id_link_id_revision_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `link_id`, `revision_id`)"
+          },
+          {
+            "name": "index_FileDownloadEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_FileDownloadEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_FileDownloadEntity_priority",
+            "unique": false,
+            "columnNames": [
+              "priority"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_FileDownloadEntity_priority` ON `${TABLE_NAME}` (`priority`)"
+          },
+          {
+            "name": "index_FileDownloadEntity_user_id_state",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "state"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_FileDownloadEntity_user_id_state` ON `${TABLE_NAME}` (`user_id`, `state`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ParentLinkDownloadEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `link_id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `type` INTEGER NOT NULL, `priority` INTEGER NOT NULL, `retryable` INTEGER NOT NULL, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkType",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "retryable",
+            "columnName": "retryable",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ParentLinkDownloadEntity_user_id_volume_id_share_id_link_id",
+            "unique": true,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ParentLinkDownloadEntity_user_id_volume_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `link_id`)"
+          },
+          {
+            "name": "index_ParentLinkDownloadEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ParentLinkDownloadEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TrashWorkEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `work_id` TEXT NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "workId",
+            "columnName": "work_id",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TrashWorkEntity_user_id_share_id_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TrashWorkEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          },
+          {
+            "name": "index_TrashWorkEntity_work_id",
+            "unique": false,
+            "columnNames": [
+              "work_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TrashWorkEntity_work_id` ON `${TABLE_NAME}` (`work_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "MessageEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `user_id` TEXT NOT NULL, `content` TEXT NOT NULL, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_MessageEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_MessageEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UiSettingsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `layout_type` TEXT NOT NULL, `theme_style` TEXT NOT NULL, `home_tab` TEXT DEFAULT NULL, PRIMARY KEY(`user_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "layoutType",
+            "columnName": "layout_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "themeStyle",
+            "columnName": "theme_style",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "homeTab",
+            "columnName": "home_tab",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DriveLinkRemoteKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `previous_key` INTEGER, `next_key` INTEGER, PRIMARY KEY(`key`, `user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "prevKey",
+            "columnName": "previous_key",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "nextKey",
+            "columnName": "next_key",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key",
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_DriveLinkRemoteKeyEntity_user_id_share_id_link_id",
+            "unique": true,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_DriveLinkRemoteKeyEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          },
+          {
+            "name": "index_DriveLinkRemoteKeyEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DriveLinkRemoteKeyEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_DriveLinkRemoteKeyEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DriveLinkRemoteKeyEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_DriveLinkRemoteKeyEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DriveLinkRemoteKeyEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_DriveLinkRemoteKeyEntity_key",
+            "unique": false,
+            "columnNames": [
+              "key"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DriveLinkRemoteKeyEntity_key` ON `${TABLE_NAME}` (`key`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SortingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `sorting_by` TEXT NOT NULL, `sorting_direction` TEXT NOT NULL, PRIMARY KEY(`user_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sortingBy",
+            "columnName": "sorting_by",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sortingDirection",
+            "columnName": "sorting_direction",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkUploadEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `revision_id` TEXT NOT NULL, `name` TEXT NOT NULL, `mime_type` TEXT NOT NULL, `node_key` TEXT NOT NULL, `node_passphrase` TEXT NOT NULL, `node_passphrase_signature` TEXT NOT NULL, `content_key_packet` TEXT NOT NULL, `content_key_packet_signature` TEXT NOT NULL, `manifest_signature` TEXT NOT NULL, `state` TEXT NOT NULL, `size` INTEGER DEFAULT NULL, `last_modified` INTEGER, `uri` TEXT DEFAULT NULL, `should_delete_source_uri` INTEGER NOT NULL DEFAULT false, `media_resolution_width` INTEGER DEFAULT NULL, `media_resolution_height` INTEGER DEFAULT NULL, `digests` TEXT DEFAULT NULL, `network_type_provider_type` TEXT NOT NULL DEFAULT 'DEFAULT', `duration` INTEGER DEFAULT NULL, `latitude` REAL DEFAULT NULL, `longitude` REAL DEFAULT NULL, `creation_time` INTEGER DEFAULT NULL, `model` TEXT DEFAULT NULL, `orientation` INTEGER DEFAULT NULL, `subject_area` TEXT DEFAULT NULL, `should_announce_event` INTEGER NOT NULL DEFAULT true, `cache_option` TEXT NOT NULL DEFAULT 'ALL', `priority` INTEGER NOT NULL DEFAULT 9223372036854775807, `upload_creation_time` INTEGER, `should_broadcast_error_message` INTEGER NOT NULL DEFAULT true, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "revisionId",
+            "columnName": "revision_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mime_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodeKey",
+            "columnName": "node_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodePassphrase",
+            "columnName": "node_passphrase",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodePassphraseSignature",
+            "columnName": "node_passphrase_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contentKeyPacket",
+            "columnName": "content_key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contentKeyPacketSignature",
+            "columnName": "content_key_packet_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "manifestSignature",
+            "columnName": "manifest_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "lastModified",
+            "columnName": "last_modified",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "uri",
+            "columnName": "uri",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "shouldDeleteSourceUri",
+            "columnName": "should_delete_source_uri",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "mediaResolutionWidth",
+            "columnName": "media_resolution_width",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "mediaResolutionHeight",
+            "columnName": "media_resolution_height",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "digests",
+            "columnName": "digests",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "networkTypeProviderType",
+            "columnName": "network_type_provider_type",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'DEFAULT'"
+          },
+          {
+            "fieldPath": "mediaDuration",
+            "columnName": "duration",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "latitude",
+            "columnName": "latitude",
+            "affinity": "REAL",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "longitude",
+            "columnName": "longitude",
+            "affinity": "REAL",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "cameraCreationDateTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "cameraModel",
+            "columnName": "model",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "cameraOrientation",
+            "columnName": "orientation",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "cameraSubjectArea",
+            "columnName": "subject_area",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "shouldAnnounceEvent",
+            "columnName": "should_announce_event",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          },
+          {
+            "fieldPath": "cacheOption",
+            "columnName": "cache_option",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'ALL'"
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "9223372036854775807"
+          },
+          {
+            "fieldPath": "uploadCreationDateTime",
+            "columnName": "upload_creation_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "shouldBroadcastErrorMessage",
+            "columnName": "should_broadcast_error_message",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkUploadEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkUploadEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_LinkUploadEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkUploadEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_LinkUploadEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkUploadEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_LinkUploadEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkUploadEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_LinkUploadEntity_revision_id",
+            "unique": false,
+            "columnNames": [
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkUploadEntity_revision_id` ON `${TABLE_NAME}` (`revision_id`)"
+          },
+          {
+            "name": "index_LinkUploadEntity_parent_id",
+            "unique": false,
+            "columnNames": [
+              "parent_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkUploadEntity_parent_id` ON `${TABLE_NAME}` (`parent_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UploadBlockEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`upload_link_id` INTEGER NOT NULL, `index` INTEGER NOT NULL, `size` INTEGER NOT NULL, `encrypted_signature` TEXT NOT NULL, `hash` TEXT NOT NULL, `token` TEXT NOT NULL, `url` TEXT NOT NULL, `raw_size` INTEGER NOT NULL DEFAULT 0, `type` TEXT NOT NULL DEFAULT 'FILE', `verifier_token` TEXT DEFAULT NULL, PRIMARY KEY(`upload_link_id`, `index`), FOREIGN KEY(`upload_link_id`) REFERENCES `LinkUploadEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "uploadLinkId",
+            "columnName": "upload_link_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "index",
+            "columnName": "index",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "encryptedSignature",
+            "columnName": "encrypted_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uploadToken",
+            "columnName": "token",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "rawSize",
+            "columnName": "raw_size",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'FILE'"
+          },
+          {
+            "fieldPath": "verifierToken",
+            "columnName": "verifier_token",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "upload_link_id",
+            "index"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "LinkUploadEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "upload_link_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UploadBulkEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `should_delete_source_uri` INTEGER NOT NULL, `network_type_provider_type` TEXT NOT NULL DEFAULT 'DEFAULT', `should_announce_event` INTEGER NOT NULL DEFAULT true, `cache_option` TEXT NOT NULL DEFAULT 'ALL', `priority` INTEGER NOT NULL DEFAULT 9223372036854775807, `should_broadcast_error_message` INTEGER NOT NULL DEFAULT true, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shouldDeleteSourceUri",
+            "columnName": "should_delete_source_uri",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "networkTypeProviderType",
+            "columnName": "network_type_provider_type",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'DEFAULT'"
+          },
+          {
+            "fieldPath": "shouldAnnounceEvent",
+            "columnName": "should_announce_event",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          },
+          {
+            "fieldPath": "cacheOption",
+            "columnName": "cache_option",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'ALL'"
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "9223372036854775807"
+          },
+          {
+            "fieldPath": "shouldBroadcastErrorMessage",
+            "columnName": "should_broadcast_error_message",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UploadBulkEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UploadBulkEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_UploadBulkEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UploadBulkEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_UploadBulkEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UploadBulkEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_UploadBulkEntity_parent_id",
+            "unique": false,
+            "columnNames": [
+              "parent_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UploadBulkEntity_parent_id` ON `${TABLE_NAME}` (`parent_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UploadBulkUriStringEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `upload_bulk_id` INTEGER NOT NULL, `uri` TEXT NOT NULL, `name` TEXT, `mime_type` TEXT, `size` INTEGER, `last_modified` INTEGER, FOREIGN KEY(`upload_bulk_id`) REFERENCES `UploadBulkEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uploadBulkId",
+            "columnName": "upload_bulk_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uri",
+            "columnName": "uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mime_type",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastModified",
+            "columnName": "last_modified",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "key"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UploadBulkUriStringEntity_upload_bulk_id",
+            "unique": false,
+            "columnNames": [
+              "upload_bulk_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UploadBulkUriStringEntity_upload_bulk_id` ON `${TABLE_NAME}` (`upload_bulk_id`)"
+          },
+          {
+            "name": "index_UploadBulkUriStringEntity_uri",
+            "unique": false,
+            "columnNames": [
+              "uri"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UploadBulkUriStringEntity_uri` ON `${TABLE_NAME}` (`uri`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UploadBulkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "upload_bulk_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UploadTagEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`upload_link_id` INTEGER NOT NULL, `tag` INTEGER NOT NULL, PRIMARY KEY(`upload_link_id`, `tag`), FOREIGN KEY(`upload_link_id`) REFERENCES `LinkUploadEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "uploadLinkId",
+            "columnName": "upload_link_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "upload_link_id",
+            "tag"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "LinkUploadEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "upload_link_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "FolderMetadataEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `last_fetch_children_timestamp` INTEGER, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastFetchChildrenTimestamp",
+            "columnName": "last_fetch_children_timestamp",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TrashMetadataEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `last_fetch_trash_timestamp` INTEGER, PRIMARY KEY(`user_id`, `volume_id`), FOREIGN KEY(`user_id`, `volume_id`) REFERENCES `VolumeEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastFetchTrashTimestamp",
+            "columnName": "last_fetch_trash_timestamp",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "VolumeEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "RawBlockEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`upload_link_id` INTEGER NOT NULL, `index` INTEGER NOT NULL, `name` TEXT NOT NULL, PRIMARY KEY(`upload_link_id`, `index`), FOREIGN KEY(`upload_link_id`) REFERENCES `LinkUploadEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "uploadLinkId",
+            "columnName": "upload_link_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "index",
+            "columnName": "index",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "upload_link_id",
+            "index"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_RawBlockEntity_upload_link_id",
+            "unique": false,
+            "columnNames": [
+              "upload_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RawBlockEntity_upload_link_id` ON `${TABLE_NAME}` (`upload_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkUploadEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "upload_link_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "BackupConfigurationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `network_type` TEXT NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `parent_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "networkType",
+            "columnName": "network_type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "parent_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "BackupDuplicateEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `hash` TEXT NOT NULL, `content_hash` TEXT, `link_id` TEXT, `state` TEXT, `revision_id` TEXT, `client_uid` TEXT, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "linkState",
+            "columnName": "state",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "revisionId",
+            "columnName": "revision_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "clientUid",
+            "columnName": "client_uid",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "BackupErrorEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `error` TEXT NOT NULL, `retryable` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `parent_id`, `error`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "error",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "retryable",
+            "columnName": "retryable",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "parent_id",
+            "error"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_BackupErrorEntity_user_id_share_id_parent_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BackupErrorEntity_user_id_share_id_parent_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `parent_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "BackupFileEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `bucket_id` INTEGER NOT NULL, `uri` TEXT NOT NULL, `mime_type` TEXT NOT NULL, `name` TEXT NOT NULL, `hash` TEXT NOT NULL, `size` INTEGER NOT NULL, `state` TEXT NOT NULL DEFAULT 'IDLE', `creation_time` INTEGER NOT NULL, `priority` INTEGER NOT NULL DEFAULT 9223372036854775807, `attempts` INTEGER NOT NULL DEFAULT 0, `last_modified` INTEGER, PRIMARY KEY(`user_id`, `share_id`, `parent_id`, `uri`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`, `bucket_id`) REFERENCES `BackupFolderEntity`(`user_id`, `share_id`, `parent_id`, `bucket_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bucketId",
+            "columnName": "bucket_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uriString",
+            "columnName": "uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mime_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'IDLE'"
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uploadPriority",
+            "columnName": "priority",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "9223372036854775807"
+          },
+          {
+            "fieldPath": "attempts",
+            "columnName": "attempts",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "lastModified",
+            "columnName": "last_modified",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "parent_id",
+            "uri"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_BackupFileEntity_user_id_share_id_parent_id_bucket_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "parent_id",
+              "bucket_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BackupFileEntity_user_id_share_id_parent_id_bucket_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `parent_id`, `bucket_id`)"
+          },
+          {
+            "name": "index_BackupFileEntity_user_id_share_id_parent_id_uri",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "parent_id",
+              "uri"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BackupFileEntity_user_id_share_id_parent_id_uri` ON `${TABLE_NAME}` (`user_id`, `share_id`, `parent_id`, `uri`)"
+          },
+          {
+            "name": "index_BackupFileEntity_user_id_share_id_parent_id_state",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "parent_id",
+              "state"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BackupFileEntity_user_id_share_id_parent_id_state` ON `${TABLE_NAME}` (`user_id`, `share_id`, `parent_id`, `state`)"
+          },
+          {
+            "name": "index_BackupFileEntity_user_id_share_id_parent_id_bucket_id_state",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "parent_id",
+              "bucket_id",
+              "state"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BackupFileEntity_user_id_share_id_parent_id_bucket_id_state` ON `${TABLE_NAME}` (`user_id`, `share_id`, `parent_id`, `bucket_id`, `state`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          },
+          {
+            "table": "BackupFolderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id",
+              "bucket_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "parent_id",
+              "bucket_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "BackupFolderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `bucket_id` INTEGER NOT NULL, `update_time` INTEGER, `sync_time` INTEGER DEFAULT NULL, PRIMARY KEY(`user_id`, `share_id`, `parent_id`, `bucket_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bucketId",
+            "columnName": "bucket_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "updateTime",
+            "columnName": "update_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "syncTime",
+            "columnName": "sync_time",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "parent_id",
+            "bucket_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InitialBackupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `creation_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `parent_id`))",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creationTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "parent_id"
+          ]
+        }
+      },
+      {
+        "tableName": "UploadStatsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `count` INTEGER NOT NULL, `size` INTEGER NOT NULL, `creation_time` INTEGER NOT NULL, `capture_time` INTEGER, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "count",
+            "columnName": "count",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minimumUploadCreationDateTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minimumFileCreationDateTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DismissedQuotaEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `level` TEXT NOT NULL, `max_space` INTEGER NOT NULL, `update_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `level`, `max_space`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "level",
+            "columnName": "level",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "maxSpace",
+            "columnName": "max_space",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestampS",
+            "columnName": "update_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "level",
+            "max_space"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DismissedUserMessageEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `user_message` TEXT NOT NULL, `update_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `user_message`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userMessage",
+            "columnName": "user_message",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestampS",
+            "columnName": "update_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "user_message"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "NotificationChannelEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`user_id`, `type`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "type"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_NotificationChannelEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_NotificationChannelEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "NotificationEventEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `channel_type` TEXT NOT NULL, `notification_tag` TEXT NOT NULL, `notification_id` INTEGER NOT NULL, `notification_event_id` TEXT NOT NULL, `notification_event` TEXT NOT NULL, PRIMARY KEY(`user_id`, `channel_type`, `notification_tag`, `notification_id`, `notification_event_id`), FOREIGN KEY(`user_id`, `channel_type`) REFERENCES `NotificationChannelEntity`(`user_id`, `type`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "channelType",
+            "columnName": "channel_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationTag",
+            "columnName": "notification_tag",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationId",
+            "columnName": "notification_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationEventId",
+            "columnName": "notification_event_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationEvent",
+            "columnName": "notification_event",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "channel_type",
+            "notification_tag",
+            "notification_id",
+            "notification_event_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_NotificationEventEntity_user_id_channel_type_notification_tag_notification_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "channel_type",
+              "notification_tag",
+              "notification_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_NotificationEventEntity_user_id_channel_type_notification_tag_notification_id` ON `${TABLE_NAME}` (`user_id`, `channel_type`, `notification_tag`, `notification_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "NotificationChannelEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "channel_type"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "type"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TaglessNotificationEventEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `channel_type` TEXT NOT NULL, `notification_id` INTEGER NOT NULL, `notification_event_id` TEXT NOT NULL, `notification_event` TEXT NOT NULL, PRIMARY KEY(`user_id`, `channel_type`, `notification_id`, `notification_event_id`), FOREIGN KEY(`user_id`, `channel_type`) REFERENCES `NotificationChannelEntity`(`user_id`, `type`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "channelType",
+            "columnName": "channel_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationId",
+            "columnName": "notification_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationEventId",
+            "columnName": "notification_event_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationEvent",
+            "columnName": "notification_event",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "channel_type",
+            "notification_id",
+            "notification_event_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TaglessNotificationEventEntity_user_id_channel_type_notification_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "channel_type",
+              "notification_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaglessNotificationEventEntity_user_id_channel_type_notification_id` ON `${TABLE_NAME}` (`user_id`, `channel_type`, `notification_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "NotificationChannelEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "channel_type"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "type"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkSelectionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `selection_id` TEXT NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `link_id`, `selection_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectionId",
+            "columnName": "selection_id",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id",
+            "selection_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkSelectionEntity_user_id_share_id_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkSelectionEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          },
+          {
+            "name": "index_LinkSelectionEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkSelectionEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_LinkSelectionEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkSelectionEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_LinkSelectionEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkSelectionEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_LinkSelectionEntity_selection_id",
+            "unique": false,
+            "columnNames": [
+              "selection_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkSelectionEntity_selection_id` ON `${TABLE_NAME}` (`selection_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WorkerRunEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `user_id` TEXT NOT NULL, `worker_id` TEXT NOT NULL, `run_at` INTEGER NOT NULL, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "workerId",
+            "columnName": "worker_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "runAt",
+            "columnName": "run_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_WorkerRunEntity_worker_id",
+            "unique": false,
+            "columnNames": [
+              "worker_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_WorkerRunEntity_worker_id` ON `${TABLE_NAME}` (`worker_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PhotoListingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PhotoListingEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_user_id_volume_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_user_id_volume_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_user_id_share_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_user_id_share_id_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_user_id_volume_id_capture_time_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "capture_time",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_user_id_volume_id_capture_time_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `capture_time`, `id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_user_id_volume_id_share_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_user_id_volume_id_share_id_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "RelatedPhotoEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `id` TEXT NOT NULL, `main_photo_link_id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `main_photo_link_id`) REFERENCES `PhotoListingEntity`(`user_id`, `volume_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mainPhotoLinkId",
+            "columnName": "main_photo_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_RelatedPhotoEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RelatedPhotoEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_RelatedPhotoEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RelatedPhotoEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_RelatedPhotoEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RelatedPhotoEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_RelatedPhotoEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RelatedPhotoEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_RelatedPhotoEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RelatedPhotoEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          },
+          {
+            "name": "index_RelatedPhotoEntity_user_id_volume_id_main_photo_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "main_photo_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RelatedPhotoEntity_user_id_volume_id_main_photo_link_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `main_photo_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "PhotoListingEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "main_photo_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TaggedPhotoListingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `tag` INTEGER NOT NULL, `id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `tag`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "tag",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TaggedPhotoListingEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_user_id_volume_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_user_id_volume_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_user_id_share_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_user_id_share_id_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `id`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_user_id_volume_id_tag",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "tag"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_user_id_volume_id_tag` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `tag`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_user_id_volume_id_share_id_tag",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "tag"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_user_id_volume_id_share_id_tag` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `tag`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_user_id_volume_id_id_tag_capture_time",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "id",
+              "tag",
+              "capture_time"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_user_id_volume_id_id_tag_capture_time` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `id`, `tag`, `capture_time`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TaggedRelatedPhotoEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `tag` INTEGER NOT NULL, `id` TEXT NOT NULL, `main_photo_link_id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `tag`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `tag`, `main_photo_link_id`) REFERENCES `TaggedPhotoListingEntity`(`user_id`, `volume_id`, `share_id`, `tag`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mainPhotoLinkId",
+            "columnName": "main_photo_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "tag",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TaggedRelatedPhotoEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedRelatedPhotoEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_TaggedRelatedPhotoEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedRelatedPhotoEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_TaggedRelatedPhotoEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedRelatedPhotoEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_TaggedRelatedPhotoEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedRelatedPhotoEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_TaggedRelatedPhotoEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedRelatedPhotoEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          },
+          {
+            "name": "index_TaggedRelatedPhotoEntity_user_id_volume_id_main_photo_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "main_photo_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedRelatedPhotoEntity_user_id_volume_id_main_photo_link_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `main_photo_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "TaggedPhotoListingEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "tag",
+              "main_photo_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "tag",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PhotoListingRemoteKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `key` TEXT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `previous_key` TEXT, `next_key` TEXT, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `link_id`) REFERENCES `PhotoListingEntity`(`user_id`, `volume_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "prevKey",
+            "columnName": "previous_key",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "nextKey",
+            "columnName": "next_key",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PhotoListingRemoteKeyEntity_key",
+            "unique": false,
+            "columnNames": [
+              "key"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingRemoteKeyEntity_key` ON `${TABLE_NAME}` (`key`)"
+          },
+          {
+            "name": "index_PhotoListingRemoteKeyEntity_key_user_id_volume_id_share_id_link_id",
+            "unique": true,
+            "columnNames": [
+              "key",
+              "user_id",
+              "volume_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_PhotoListingRemoteKeyEntity_key_user_id_volume_id_share_id_link_id` ON `${TABLE_NAME}` (`key`, `user_id`, `volume_id`, `share_id`, `link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "PhotoListingEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TaggedPhotoListingRemoteKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `key` TEXT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `tag` INTEGER NOT NULL, `link_id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `previous_key` TEXT, `next_key` TEXT, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `tag`, `link_id`) REFERENCES `TaggedPhotoListingEntity`(`user_id`, `volume_id`, `share_id`, `tag`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "prevKey",
+            "columnName": "previous_key",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "nextKey",
+            "columnName": "next_key",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TaggedPhotoListingRemoteKeyEntity_key",
+            "unique": false,
+            "columnNames": [
+              "key"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingRemoteKeyEntity_key` ON `${TABLE_NAME}` (`key`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingRemoteKeyEntity_key_user_id_volume_id_share_id_tag_link_id",
+            "unique": true,
+            "columnNames": [
+              "key",
+              "user_id",
+              "volume_id",
+              "share_id",
+              "tag",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TaggedPhotoListingRemoteKeyEntity_key_user_id_volume_id_share_id_tag_link_id` ON `${TABLE_NAME}` (`key`, `user_id`, `volume_id`, `share_id`, `tag`, `link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "TaggedPhotoListingEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "tag",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "tag",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AlbumRelatedPhotoEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `album_id` TEXT NOT NULL, `id` TEXT NOT NULL, `main_photo_link_id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `album_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `album_id`, `main_photo_link_id`) REFERENCES `AlbumPhotoListingEntity`(`user_id`, `volume_id`, `share_id`, `album_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "albumId",
+            "columnName": "album_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mainPhotoLinkId",
+            "columnName": "main_photo_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "album_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AlbumRelatedPhotoEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumRelatedPhotoEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_AlbumRelatedPhotoEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumRelatedPhotoEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_AlbumRelatedPhotoEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumRelatedPhotoEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_AlbumRelatedPhotoEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumRelatedPhotoEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_AlbumRelatedPhotoEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumRelatedPhotoEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          },
+          {
+            "name": "index_AlbumRelatedPhotoEntity_user_id_volume_id_album_id_main_photo_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "album_id",
+              "main_photo_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumRelatedPhotoEntity_user_id_volume_id_album_id_main_photo_link_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `album_id`, `main_photo_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "AlbumPhotoListingEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "album_id",
+              "main_photo_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "album_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AlbumPhotoListingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `album_id` TEXT NOT NULL, `id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `added_time` INTEGER NOT NULL, `is_child_of_album` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `album_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "albumId",
+            "columnName": "album_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addedTime",
+            "columnName": "added_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isChildOfAlbum",
+            "columnName": "is_child_of_album",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "album_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AlbumPhotoListingEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingEntity_album_id",
+            "unique": false,
+            "columnNames": [
+              "album_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_album_id` ON `${TABLE_NAME}` (`album_id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingEntity_user_id_volume_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_user_id_volume_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingEntity_user_id_volume_id_share_id_album_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "album_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_user_id_volume_id_share_id_album_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `album_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AlbumListingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `id` TEXT NOT NULL, `locked` INTEGER NOT NULL, `count` INTEGER NOT NULL, `last_activity_time` INTEGER NOT NULL, `link_id` TEXT, `is_shared` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "albumId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locked",
+            "columnName": "locked",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "photoCount",
+            "columnName": "count",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastActivityTime",
+            "columnName": "last_activity_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "coverLinkId",
+            "columnName": "link_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isShared",
+            "columnName": "is_shared",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AlbumListingEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumListingEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_AlbumListingEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumListingEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_AlbumListingEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumListingEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_AlbumListingEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumListingEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_AlbumListingEntity_user_id_volume_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumListingEntity_user_id_volume_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`)"
+          },
+          {
+            "name": "index_AlbumListingEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumListingEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AlbumPhotoListingRemoteKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `key` TEXT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `album_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `previous_key` TEXT, `next_key` TEXT, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `album_id`, `link_id`) REFERENCES `AlbumPhotoListingEntity`(`user_id`, `volume_id`, `share_id`, `album_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "albumId",
+            "columnName": "album_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "prevKey",
+            "columnName": "previous_key",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "nextKey",
+            "columnName": "next_key",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AlbumPhotoListingRemoteKeyEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingRemoteKeyEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingRemoteKeyEntity_key",
+            "unique": false,
+            "columnNames": [
+              "key"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingRemoteKeyEntity_key` ON `${TABLE_NAME}` (`key`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingRemoteKeyEntity_key_user_id_volume_id_share_id_album_id_link_id",
+            "unique": true,
+            "columnNames": [
+              "key",
+              "user_id",
+              "volume_id",
+              "share_id",
+              "album_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_AlbumPhotoListingRemoteKeyEntity_key_user_id_volume_id_share_id_album_id_link_id` ON `${TABLE_NAME}` (`key`, `user_id`, `volume_id`, `share_id`, `album_id`, `link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "AlbumPhotoListingEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "album_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "album_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "MediaStoreVersionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `media_store_volume_name` TEXT NOT NULL, `version` TEXT, PRIMARY KEY(`user_id`, `media_store_volume_name`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeName",
+            "columnName": "media_store_volume_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "media_store_volume_name"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddToAlbumEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `album_share_id` TEXT, `album_id` TEXT, `capture_time` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `album_share_id`, `album_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "albumShareId",
+            "columnName": "album_share_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "albumId",
+            "columnName": "album_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AddToAlbumEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddToAlbumEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_AddToAlbumEntity_album_id",
+            "unique": false,
+            "columnNames": [
+              "album_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddToAlbumEntity_album_id` ON `${TABLE_NAME}` (`album_id`)"
+          },
+          {
+            "name": "index_AddToAlbumEntity_user_id_album_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "album_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddToAlbumEntity_user_id_album_id` ON `${TABLE_NAME}` (`user_id`, `album_id`)"
+          },
+          {
+            "name": "index_AddToAlbumEntity_user_id_album_share_id_album_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "album_share_id",
+              "album_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddToAlbumEntity_user_id_album_share_id_album_id` ON `${TABLE_NAME}` (`user_id`, `album_share_id`, `album_id`)"
+          },
+          {
+            "name": "index_AddToAlbumEntity_user_id_share_id_link_id_album_share_id_album_id",
+            "unique": true,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id",
+              "album_share_id",
+              "album_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_AddToAlbumEntity_user_id_share_id_link_id_album_share_id_album_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`, `album_share_id`, `album_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "album_share_id",
+              "album_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TagsMigrationFileEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `state` TEXT NOT NULL, `uri` TEXT, `mime_type` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uriString",
+            "columnName": "uri",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mime_type",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TagsMigrationFileEntity_user_id_volume_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TagsMigrationFileEntity_user_id_volume_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`)"
+          },
+          {
+            "name": "index_TagsMigrationFileEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TagsMigrationFileEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_TagsMigrationFileEntity_user_id_share_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TagsMigrationFileEntity_user_id_share_id_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `id`)"
+          },
+          {
+            "name": "index_TagsMigrationFileEntity_user_id_volume_id_share_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TagsMigrationFileEntity_user_id_volume_id_share_id_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TagsMigrationFileTagEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `id` TEXT NOT NULL, `tag` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`, `tag`), FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `id`) REFERENCES `TagsMigrationFileEntity`(`user_id`, `volume_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id",
+            "tag"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TagsMigrationFileTagEntity_user_id_volume_id_share_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TagsMigrationFileTagEntity_user_id_volume_id_share_id_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "TagsMigrationFileEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DriveFeatureFlagRefreshEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `id` TEXT NOT NULL, `last_fetch_timestamp` INTEGER, PRIMARY KEY(`user_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastFetchTimestamp",
+            "columnName": "last_fetch_timestamp",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_DriveFeatureFlagRefreshEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DriveFeatureFlagRefreshEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DeviceEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `id` TEXT NOT NULL, `type` INTEGER NOT NULL, `name` TEXT NOT NULL, `sync_state` INTEGER NOT NULL, `creation_time` INTEGER NOT NULL, `last_modified` INTEGER, `last_synced` INTEGER, PRIMARY KEY(`user_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "syncState",
+            "columnName": "sync_state",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creationTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastModified",
+            "columnName": "last_modified",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastSynced",
+            "columnName": "last_synced",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_DeviceEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_DeviceEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_DeviceEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_DeviceEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_DeviceEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_DeviceEntity_user_id_volume_id_share_id_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_user_id_volume_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `link_id`)"
+          },
+          {
+            "name": "index_DeviceEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_DeviceEntity_user_id_share_id_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UrlLastFetchEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `url` TEXT NOT NULL, `last_fetch_timestamp` INTEGER, PRIMARY KEY(`user_id`, `url`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastFetchTimestamp",
+            "columnName": "last_fetch_timestamp",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "url"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UrlLastFetchEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UrlLastFetchEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_UrlLastFetchEntity_url",
+            "unique": false,
+            "columnNames": [
+              "url"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UrlLastFetchEntity_url` ON `${TABLE_NAME}` (`url`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SharedWithMeListingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `type` INTEGER, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_SharedWithMeListingEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedWithMeListingEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_SharedWithMeListingEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedWithMeListingEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_SharedWithMeListingEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedWithMeListingEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_SharedWithMeListingEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedWithMeListingEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_SharedWithMeListingEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedWithMeListingEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SharedByMeListingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_SharedByMeListingEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedByMeListingEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_SharedByMeListingEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedByMeListingEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_SharedByMeListingEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedByMeListingEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_SharedByMeListingEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedByMeListingEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_SharedByMeListingEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedByMeListingEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SharedRemoteKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `key` TEXT NOT NULL, `anchor_id` TEXT NOT NULL, `has_more` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "anchorId",
+            "columnName": "anchor_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasMore",
+            "columnName": "has_more",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "StalePublicAddressKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `email` TEXT NOT NULL, `key` TEXT NOT NULL, PRIMARY KEY(`email`, `key`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`email`, `key`) REFERENCES `PublicAddressKeyDataEntity`(`email`, `publicKey`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "email",
+            "key"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_StalePublicAddressKeyEntity_email",
+            "unique": false,
+            "columnNames": [
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_StalePublicAddressKeyEntity_email` ON `${TABLE_NAME}` (`email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "PublicAddressKeyDataEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "email",
+              "key"
+            ],
+            "referencedColumns": [
+              "email",
+              "publicKey"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "CounterEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `key` TEXT NOT NULL, `count` INTEGER NOT NULL, `last_modified` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `key`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "count",
+            "columnName": "count",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastModified",
+            "columnName": "last_modified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "key"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_CounterEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CounterEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_CounterEntity_key",
+            "unique": false,
+            "columnNames": [
+              "key"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CounterEntity_key` ON `${TABLE_NAME}` (`key`)"
+          },
+          {
+            "name": "index_CounterEntity_last_modified",
+            "unique": false,
+            "columnNames": [
+              "last_modified"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CounterEntity_last_modified` ON `${TABLE_NAME}` (`last_modified`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ScanResultInfoEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `user_id` TEXT NOT NULL, `create_time` INTEGER NOT NULL, `name` TEXT NOT NULL, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ScanResultDocumentEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `type` TEXT NOT NULL, `uri` TEXT NOT NULL, PRIMARY KEY(`type`, `uri`), FOREIGN KEY(`id`) REFERENCES `ScanResultInfoEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uriString",
+            "columnName": "uri",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "type",
+            "uri"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "ScanResultInfoEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ScanResultPageEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `type` TEXT NOT NULL, `uri` TEXT NOT NULL, `index` INTEGER NOT NULL, PRIMARY KEY(`type`, `uri`), FOREIGN KEY(`id`) REFERENCES `ScanResultInfoEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uriString",
+            "columnName": "uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pageNumber",
+            "columnName": "index",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "type",
+            "uri"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ScanResultPageEntity_id_index",
+            "unique": true,
+            "columnNames": [
+              "id",
+              "index"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ScanResultPageEntity_id_index` ON `${TABLE_NAME}` (`id`, `index`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "ScanResultInfoEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9728274bca167bb0d13de243f9b198a2')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/drive/db/schemas/me.proton.android.drive.db.DriveDatabase/104.json b/drive/db/schemas/me.proton.android.drive.db.DriveDatabase/104.json
new file mode 100644
index 00000000..b6556c60
--- /dev/null
+++ b/drive/db/schemas/me.proton.android.drive.db.DriveDatabase/104.json
@@ -0,0 +1,10910 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 104,
+    "identityHash": "e8f1602d63b8e7d95e0831d437a719ab",
+    "entities": [
+      {
+        "tableName": "AccountEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `username` TEXT, `email` TEXT, `state` TEXT NOT NULL, `sessionId` TEXT, `sessionState` TEXT, PRIMARY KEY(`userId`), FOREIGN KEY(`sessionId`) REFERENCES `SessionEntity`(`sessionId`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sessionId",
+            "columnName": "sessionId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "sessionState",
+            "columnName": "sessionState",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AccountEntity_sessionId",
+            "unique": false,
+            "columnNames": [
+              "sessionId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AccountEntity_sessionId` ON `${TABLE_NAME}` (`sessionId`)"
+          },
+          {
+            "name": "index_AccountEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AccountEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "SessionEntity",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "sessionId"
+            ],
+            "referencedColumns": [
+              "sessionId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AccountMetadataEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `product` TEXT NOT NULL, `primaryAtUtc` INTEGER NOT NULL, `migrations` TEXT, PRIMARY KEY(`userId`, `product`), FOREIGN KEY(`userId`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "product",
+            "columnName": "product",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryAtUtc",
+            "columnName": "primaryAtUtc",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "migrations",
+            "columnName": "migrations",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "product"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AccountMetadataEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AccountMetadataEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_AccountMetadataEntity_product",
+            "unique": false,
+            "columnNames": [
+              "product"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AccountMetadataEntity_product` ON `${TABLE_NAME}` (`product`)"
+          },
+          {
+            "name": "index_AccountMetadataEntity_primaryAtUtc",
+            "unique": false,
+            "columnNames": [
+              "primaryAtUtc"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AccountMetadataEntity_primaryAtUtc` ON `${TABLE_NAME}` (`primaryAtUtc`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SessionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT, `sessionId` TEXT NOT NULL, `accessToken` TEXT NOT NULL, `refreshToken` TEXT NOT NULL, `scopes` TEXT NOT NULL, `product` TEXT NOT NULL, PRIMARY KEY(`sessionId`), FOREIGN KEY(`userId`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "sessionId",
+            "columnName": "sessionId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accessToken",
+            "columnName": "accessToken",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "refreshToken",
+            "columnName": "refreshToken",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scopes",
+            "columnName": "scopes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "product",
+            "columnName": "product",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "sessionId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_SessionEntity_sessionId",
+            "unique": false,
+            "columnNames": [
+              "sessionId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SessionEntity_sessionId` ON `${TABLE_NAME}` (`sessionId`)"
+          },
+          {
+            "name": "index_SessionEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SessionEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SessionDetailsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`sessionId` TEXT NOT NULL, `initialEventId` TEXT, `requiredAccountType` TEXT NOT NULL, `secondFactorEnabled` INTEGER NOT NULL, `twoPassModeEnabled` INTEGER NOT NULL, `passphrase` BLOB, `password` TEXT, `fido2AuthenticationOptionsJson` TEXT, PRIMARY KEY(`sessionId`), FOREIGN KEY(`sessionId`) REFERENCES `SessionEntity`(`sessionId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "sessionId",
+            "columnName": "sessionId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "initialEventId",
+            "columnName": "initialEventId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "requiredAccountType",
+            "columnName": "requiredAccountType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondFactorEnabled",
+            "columnName": "secondFactorEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "twoPassModeEnabled",
+            "columnName": "twoPassModeEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "passphrase",
+            "columnName": "passphrase",
+            "affinity": "BLOB"
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "fido2AuthenticationOptionsJson",
+            "columnName": "fido2AuthenticationOptionsJson",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "sessionId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_SessionDetailsEntity_sessionId",
+            "unique": false,
+            "columnNames": [
+              "sessionId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SessionDetailsEntity_sessionId` ON `${TABLE_NAME}` (`sessionId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "SessionEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "sessionId"
+            ],
+            "referencedColumns": [
+              "sessionId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UserEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `email` TEXT, `name` TEXT, `displayName` TEXT, `currency` TEXT NOT NULL, `credit` INTEGER NOT NULL, `createdAtUtc` INTEGER NOT NULL, `usedSpace` INTEGER NOT NULL, `maxSpace` INTEGER NOT NULL, `maxUpload` INTEGER NOT NULL, `type` INTEGER, `role` INTEGER, `private` INTEGER NOT NULL, `subscribed` INTEGER NOT NULL, `services` INTEGER NOT NULL, `delinquent` INTEGER, `passphrase` BLOB, `flags` TEXT, `maxBaseSpace` INTEGER, `maxDriveSpace` INTEGER, `usedBaseSpace` INTEGER, `usedDriveSpace` INTEGER, `recovery_state` INTEGER, `recovery_startTime` INTEGER, `recovery_endTime` INTEGER, `recovery_sessionId` TEXT, `recovery_reason` INTEGER, PRIMARY KEY(`userId`), FOREIGN KEY(`userId`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "currency",
+            "columnName": "currency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "credit",
+            "columnName": "credit",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAtUtc",
+            "columnName": "createdAtUtc",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usedSpace",
+            "columnName": "usedSpace",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "maxSpace",
+            "columnName": "maxSpace",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "maxUpload",
+            "columnName": "maxUpload",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "isPrivate",
+            "columnName": "private",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subscribed",
+            "columnName": "subscribed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "services",
+            "columnName": "services",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "delinquent",
+            "columnName": "delinquent",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "passphrase",
+            "columnName": "passphrase",
+            "affinity": "BLOB"
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "maxBaseSpace",
+            "columnName": "maxBaseSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxDriveSpace",
+            "columnName": "maxDriveSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedBaseSpace",
+            "columnName": "usedBaseSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedDriveSpace",
+            "columnName": "usedDriveSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "recovery.state",
+            "columnName": "recovery_state",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "recovery.startTime",
+            "columnName": "recovery_startTime",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "recovery.endTime",
+            "columnName": "recovery_endTime",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "recovery.sessionId",
+            "columnName": "recovery_sessionId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "recovery.reason",
+            "columnName": "recovery_reason",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UserEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UserEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UserKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `keyId` TEXT NOT NULL, `version` INTEGER NOT NULL, `privateKey` TEXT NOT NULL, `isPrimary` INTEGER NOT NULL, `isUnlockable` INTEGER NOT NULL, `fingerprint` TEXT, `activation` TEXT, `active` INTEGER, `recoverySecretHash` TEXT, `recoverySecretSignature` TEXT, PRIMARY KEY(`keyId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyId",
+            "columnName": "keyId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "privateKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPrimary",
+            "columnName": "isPrimary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isUnlockable",
+            "columnName": "isUnlockable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fingerprint",
+            "columnName": "fingerprint",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "activation",
+            "columnName": "activation",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "active",
+            "columnName": "active",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "recoverySecretHash",
+            "columnName": "recoverySecretHash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "recoverySecretSignature",
+            "columnName": "recoverySecretSignature",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "keyId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UserKeyEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UserKeyEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_UserKeyEntity_keyId",
+            "unique": false,
+            "columnNames": [
+              "keyId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UserKeyEntity_keyId` ON `${TABLE_NAME}` (`keyId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddressEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `addressId` TEXT NOT NULL, `email` TEXT NOT NULL, `displayName` TEXT, `signature` TEXT, `domainId` TEXT, `canSend` INTEGER NOT NULL, `canReceive` INTEGER NOT NULL, `enabled` INTEGER NOT NULL, `type` INTEGER, `order` INTEGER NOT NULL, `signedKeyList_data` TEXT, `signedKeyList_signature` TEXT, `signedKeyList_minEpochId` INTEGER, `signedKeyList_maxEpochId` INTEGER, `signedKeyList_expectedMinEpochId` INTEGER, PRIMARY KEY(`addressId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addressId",
+            "columnName": "addressId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "signature",
+            "columnName": "signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "domainId",
+            "columnName": "domainId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "canSend",
+            "columnName": "canSend",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canReceive",
+            "columnName": "canReceive",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "enabled",
+            "columnName": "enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "order",
+            "columnName": "order",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "signedKeyList.data",
+            "columnName": "signedKeyList_data",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "signedKeyList.signature",
+            "columnName": "signedKeyList_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "signedKeyList.minEpochId",
+            "columnName": "signedKeyList_minEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "signedKeyList.maxEpochId",
+            "columnName": "signedKeyList_maxEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "signedKeyList.expectedMinEpochId",
+            "columnName": "signedKeyList_expectedMinEpochId",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "addressId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AddressEntity_addressId",
+            "unique": false,
+            "columnNames": [
+              "addressId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddressEntity_addressId` ON `${TABLE_NAME}` (`addressId`)"
+          },
+          {
+            "name": "index_AddressEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddressEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddressKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`addressId` TEXT NOT NULL, `keyId` TEXT NOT NULL, `version` INTEGER NOT NULL, `privateKey` TEXT NOT NULL, `isPrimary` INTEGER NOT NULL, `isUnlockable` INTEGER NOT NULL, `flags` INTEGER NOT NULL, `passphrase` BLOB, `token` TEXT, `signature` TEXT, `fingerprint` TEXT, `fingerprints` TEXT, `activation` TEXT, `active` INTEGER NOT NULL, PRIMARY KEY(`keyId`), FOREIGN KEY(`addressId`) REFERENCES `AddressEntity`(`addressId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "addressId",
+            "columnName": "addressId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyId",
+            "columnName": "keyId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "privateKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPrimary",
+            "columnName": "isPrimary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isUnlockable",
+            "columnName": "isUnlockable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "passphrase",
+            "columnName": "passphrase",
+            "affinity": "BLOB"
+          },
+          {
+            "fieldPath": "token",
+            "columnName": "token",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "signature",
+            "columnName": "signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "fingerprint",
+            "columnName": "fingerprint",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "fingerprints",
+            "columnName": "fingerprints",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "activation",
+            "columnName": "activation",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "active",
+            "columnName": "active",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "keyId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AddressKeyEntity_addressId",
+            "unique": false,
+            "columnNames": [
+              "addressId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddressKeyEntity_addressId` ON `${TABLE_NAME}` (`addressId`)"
+          },
+          {
+            "name": "index_AddressKeyEntity_keyId",
+            "unique": false,
+            "columnNames": [
+              "keyId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddressKeyEntity_keyId` ON `${TABLE_NAME}` (`keyId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AddressEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "addressId"
+            ],
+            "referencedColumns": [
+              "addressId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "KeySaltEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `keyId` TEXT NOT NULL, `keySalt` TEXT, PRIMARY KEY(`userId`, `keyId`))",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyId",
+            "columnName": "keyId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keySalt",
+            "columnName": "keySalt",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "keyId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_KeySaltEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_KeySaltEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_KeySaltEntity_keyId",
+            "unique": false,
+            "columnNames": [
+              "keyId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_KeySaltEntity_keyId` ON `${TABLE_NAME}` (`keyId`)"
+          }
+        ]
+      },
+      {
+        "tableName": "PublicAddressEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `recipientType` INTEGER NOT NULL, `mimeType` TEXT, `ignoreKT` INTEGER, `signedKeyList_data` TEXT, `signedKeyList_signature` TEXT, `signedKeyList_minEpochId` INTEGER, `signedKeyList_maxEpochId` INTEGER, `signedKeyList_expectedMinEpochId` INTEGER, PRIMARY KEY(`email`))",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recipientType",
+            "columnName": "recipientType",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mimeType",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "ignoreKT",
+            "columnName": "ignoreKT",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "signedKeyListEntity.data",
+            "columnName": "signedKeyList_data",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "signedKeyListEntity.signature",
+            "columnName": "signedKeyList_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "signedKeyListEntity.minEpochId",
+            "columnName": "signedKeyList_minEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "signedKeyListEntity.maxEpochId",
+            "columnName": "signedKeyList_maxEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "signedKeyListEntity.expectedMinEpochId",
+            "columnName": "signedKeyList_expectedMinEpochId",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "email"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PublicAddressEntity_email",
+            "unique": false,
+            "columnNames": [
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PublicAddressEntity_email` ON `${TABLE_NAME}` (`email`)"
+          }
+        ]
+      },
+      {
+        "tableName": "PublicAddressKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `flags` INTEGER NOT NULL, `publicKey` TEXT NOT NULL, `isPrimary` INTEGER NOT NULL, PRIMARY KEY(`email`, `publicKey`), FOREIGN KEY(`email`) REFERENCES `PublicAddressEntity`(`email`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicKey",
+            "columnName": "publicKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPrimary",
+            "columnName": "isPrimary",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "email",
+            "publicKey"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PublicAddressKeyEntity_email",
+            "unique": false,
+            "columnNames": [
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PublicAddressKeyEntity_email` ON `${TABLE_NAME}` (`email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "PublicAddressEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "email"
+            ],
+            "referencedColumns": [
+              "email"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "HumanVerificationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`clientId` TEXT NOT NULL, `clientIdType` TEXT NOT NULL, `verificationMethods` TEXT NOT NULL, `verificationToken` TEXT, `state` TEXT NOT NULL, `humanHeaderTokenType` TEXT, `humanHeaderTokenCode` TEXT, PRIMARY KEY(`clientId`))",
+        "fields": [
+          {
+            "fieldPath": "clientId",
+            "columnName": "clientId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clientIdType",
+            "columnName": "clientIdType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "verificationMethods",
+            "columnName": "verificationMethods",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "verificationToken",
+            "columnName": "verificationToken",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "humanHeaderTokenType",
+            "columnName": "humanHeaderTokenType",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "humanHeaderTokenCode",
+            "columnName": "humanHeaderTokenCode",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "clientId"
+          ]
+        }
+      },
+      {
+        "tableName": "UserSettingsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `news` INTEGER, `locale` TEXT, `logAuth` INTEGER, `density` INTEGER, `weekStart` INTEGER, `dateFormat` INTEGER, `timeFormat` INTEGER, `earlyAccess` INTEGER, `deviceRecovery` INTEGER, `telemetry` INTEGER, `crashReports` INTEGER, `sessionAccountRecovery` INTEGER, `easyDeviceMigrationOptOut` INTEGER, `email_value` TEXT, `email_status` INTEGER, `email_notify` INTEGER, `email_reset` INTEGER, `phone_value` TEXT, `phone_status` INTEGER, `phone_notify` INTEGER, `phone_reset` INTEGER, `password_mode` INTEGER, `password_expirationTime` INTEGER, `twoFA_enabled` INTEGER, `twoFA_allowed` INTEGER, `twoFA_expirationTime` INTEGER, `twoFA_registeredKeys` TEXT, PRIMARY KEY(`userId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "news",
+            "columnName": "news",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "logAuth",
+            "columnName": "logAuth",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "density",
+            "columnName": "density",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "weekStart",
+            "columnName": "weekStart",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "dateFormat",
+            "columnName": "dateFormat",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "timeFormat",
+            "columnName": "timeFormat",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "earlyAccess",
+            "columnName": "earlyAccess",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "deviceRecovery",
+            "columnName": "deviceRecovery",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "telemetry",
+            "columnName": "telemetry",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "crashReports",
+            "columnName": "crashReports",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "sessionAccountRecovery",
+            "columnName": "sessionAccountRecovery",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "easyDeviceMigrationOptOut",
+            "columnName": "easyDeviceMigrationOptOut",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "email.value",
+            "columnName": "email_value",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "email.status",
+            "columnName": "email_status",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "email.notify",
+            "columnName": "email_notify",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "email.reset",
+            "columnName": "email_reset",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "phone.value",
+            "columnName": "phone_value",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "phone.status",
+            "columnName": "phone_status",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "phone.notify",
+            "columnName": "phone_notify",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "phone.reset",
+            "columnName": "phone_reset",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "password.mode",
+            "columnName": "password_mode",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "password.expirationTime",
+            "columnName": "password_expirationTime",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "twoFA.enabled",
+            "columnName": "twoFA_enabled",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "twoFA.allowed",
+            "columnName": "twoFA_allowed",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "twoFA.expirationTime",
+            "columnName": "twoFA_expirationTime",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "twoFA.registeredKeys",
+            "columnName": "twoFA_registeredKeys",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "EntitlementEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `key` TEXT NOT NULL, `value` TEXT NOT NULL, PRIMARY KEY(`user_id`, `key`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "key"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_EntitlementEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_EntitlementEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "OrganizationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `name` TEXT NOT NULL, `displayName` TEXT, `planName` TEXT, `twoFactorGracePeriod` INTEGER, `theme` TEXT, `email` TEXT, `maxDomains` INTEGER, `maxAddresses` INTEGER, `maxSpace` INTEGER, `maxMembers` INTEGER, `maxVPN` INTEGER, `maxCalendars` INTEGER, `features` INTEGER, `flags` INTEGER, `usedDomains` INTEGER, `usedAddresses` INTEGER, `usedSpace` INTEGER, `assignedSpace` INTEGER, `usedMembers` INTEGER, `usedVPN` INTEGER, `usedCalendars` INTEGER, `hasKeys` INTEGER, `toMigrate` INTEGER, PRIMARY KEY(`userId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "planName",
+            "columnName": "planName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "twoFactorGracePeriod",
+            "columnName": "twoFactorGracePeriod",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "theme",
+            "columnName": "theme",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "maxDomains",
+            "columnName": "maxDomains",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxAddresses",
+            "columnName": "maxAddresses",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxSpace",
+            "columnName": "maxSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxMembers",
+            "columnName": "maxMembers",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxVPN",
+            "columnName": "maxVPN",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxCalendars",
+            "columnName": "maxCalendars",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "features",
+            "columnName": "features",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedDomains",
+            "columnName": "usedDomains",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedAddresses",
+            "columnName": "usedAddresses",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedSpace",
+            "columnName": "usedSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "assignedSpace",
+            "columnName": "assignedSpace",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedMembers",
+            "columnName": "usedMembers",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedVPN",
+            "columnName": "usedVPN",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "usedCalendars",
+            "columnName": "usedCalendars",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "hasKeys",
+            "columnName": "hasKeys",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "toMigrate",
+            "columnName": "toMigrate",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "OrganizationKeysEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `publicKey` TEXT NOT NULL, `privateKey` TEXT NOT NULL, PRIMARY KEY(`userId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicKey",
+            "columnName": "publicKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "privateKey",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "EventMetadataEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `config` TEXT NOT NULL, `eventId` TEXT, `nextEventId` TEXT, `refresh` TEXT, `more` INTEGER, `retry` INTEGER NOT NULL, `state` TEXT NOT NULL, `createdAt` INTEGER NOT NULL, `updatedAt` INTEGER, `fetchedAt` INTEGER, PRIMARY KEY(`userId`, `config`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "config",
+            "columnName": "config",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "eventId",
+            "columnName": "eventId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "nextEventId",
+            "columnName": "nextEventId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "refresh",
+            "columnName": "refresh",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "more",
+            "columnName": "more",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "retry",
+            "columnName": "retry",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "updatedAt",
+            "columnName": "updatedAt",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "fetchedAt",
+            "columnName": "fetchedAt",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "config"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_EventMetadataEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_EventMetadataEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_EventMetadataEntity_config",
+            "unique": false,
+            "columnNames": [
+              "config"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_EventMetadataEntity_config` ON `${TABLE_NAME}` (`config`)"
+          },
+          {
+            "name": "index_EventMetadataEntity_createdAt",
+            "unique": false,
+            "columnNames": [
+              "createdAt"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_EventMetadataEntity_createdAt` ON `${TABLE_NAME}` (`createdAt`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "FeatureFlagEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `featureId` TEXT NOT NULL, `scope` TEXT NOT NULL, `defaultValue` INTEGER NOT NULL, `value` INTEGER NOT NULL, `variantName` TEXT, `payloadType` TEXT, `payloadValue` TEXT, PRIMARY KEY(`userId`, `featureId`))",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "featureId",
+            "columnName": "featureId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scope",
+            "columnName": "scope",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "defaultValue",
+            "columnName": "defaultValue",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "variantName",
+            "columnName": "variantName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "payloadType",
+            "columnName": "payloadType",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "payloadValue",
+            "columnName": "payloadValue",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "featureId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_FeatureFlagEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_FeatureFlagEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_FeatureFlagEntity_featureId",
+            "unique": false,
+            "columnNames": [
+              "featureId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_FeatureFlagEntity_featureId` ON `${TABLE_NAME}` (`featureId`)"
+          }
+        ]
+      },
+      {
+        "tableName": "ChallengeFrameEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`challengeFrame` TEXT NOT NULL, `flow` TEXT NOT NULL, `focusTime` TEXT NOT NULL, `clicks` INTEGER NOT NULL, `copy` TEXT NOT NULL, `paste` TEXT NOT NULL, `keys` TEXT NOT NULL, PRIMARY KEY(`challengeFrame`))",
+        "fields": [
+          {
+            "fieldPath": "challengeFrame",
+            "columnName": "challengeFrame",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "flow",
+            "columnName": "flow",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "focusTime",
+            "columnName": "focusTime",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clicks",
+            "columnName": "clicks",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "copy",
+            "columnName": "copy",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paste",
+            "columnName": "paste",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keys",
+            "columnName": "keys",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "challengeFrame"
+          ]
+        }
+      },
+      {
+        "tableName": "PurchaseEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`sessionId` TEXT NOT NULL, `planName` TEXT NOT NULL, `planCycle` INTEGER NOT NULL, `purchaseState` TEXT NOT NULL, `purchaseFailure` TEXT, `paymentProvider` TEXT NOT NULL, `paymentOrderId` TEXT, `paymentToken` TEXT, `paymentCurrency` TEXT NOT NULL, `paymentAmount` INTEGER NOT NULL, PRIMARY KEY(`planName`), FOREIGN KEY(`sessionId`) REFERENCES `SessionEntity`(`sessionId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "sessionId",
+            "columnName": "sessionId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "planName",
+            "columnName": "planName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "planCycle",
+            "columnName": "planCycle",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "purchaseState",
+            "columnName": "purchaseState",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "purchaseFailure",
+            "columnName": "purchaseFailure",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "paymentProvider",
+            "columnName": "paymentProvider",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentOrderId",
+            "columnName": "paymentOrderId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "paymentToken",
+            "columnName": "paymentToken",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "paymentCurrency",
+            "columnName": "paymentCurrency",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentAmount",
+            "columnName": "paymentAmount",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "planName"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PurchaseEntity_planName",
+            "unique": false,
+            "columnNames": [
+              "planName"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PurchaseEntity_planName` ON `${TABLE_NAME}` (`planName`)"
+          },
+          {
+            "name": "index_PurchaseEntity_sessionId",
+            "unique": false,
+            "columnNames": [
+              "sessionId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PurchaseEntity_sessionId` ON `${TABLE_NAME}` (`sessionId`)"
+          },
+          {
+            "name": "index_PurchaseEntity_purchaseState",
+            "unique": false,
+            "columnNames": [
+              "purchaseState"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PurchaseEntity_purchaseState` ON `${TABLE_NAME}` (`purchaseState`)"
+          },
+          {
+            "name": "index_PurchaseEntity_paymentProvider",
+            "unique": false,
+            "columnNames": [
+              "paymentProvider"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PurchaseEntity_paymentProvider` ON `${TABLE_NAME}` (`paymentProvider`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "SessionEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "sessionId"
+            ],
+            "referencedColumns": [
+              "sessionId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "GooglePurchaseEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`googlePurchaseToken` TEXT NOT NULL, `paymentToken` TEXT NOT NULL, PRIMARY KEY(`googlePurchaseToken`))",
+        "fields": [
+          {
+            "fieldPath": "googlePurchaseToken",
+            "columnName": "googlePurchaseToken",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "paymentToken",
+            "columnName": "paymentToken",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "googlePurchaseToken"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_GooglePurchaseEntity_paymentToken",
+            "unique": true,
+            "columnNames": [
+              "paymentToken"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_GooglePurchaseEntity_paymentToken` ON `${TABLE_NAME}` (`paymentToken`)"
+          }
+        ]
+      },
+      {
+        "tableName": "ObservabilityEventEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `version` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `data` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "AddressChangeEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `changeId` TEXT NOT NULL, `counterEncrypted` TEXT NOT NULL, `emailEncrypted` TEXT NOT NULL, `epochIdEncrypted` TEXT NOT NULL, `creationTimestampEncrypted` TEXT NOT NULL, `publicKeysEncrypted` TEXT NOT NULL, `isObsolete` TEXT NOT NULL, PRIMARY KEY(`userId`, `changeId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changeId",
+            "columnName": "changeId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "counterEncrypted",
+            "columnName": "counterEncrypted",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "emailEncrypted",
+            "columnName": "emailEncrypted",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "epochIdEncrypted",
+            "columnName": "epochIdEncrypted",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creationTimestampEncrypted",
+            "columnName": "creationTimestampEncrypted",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicKeysEncrypted",
+            "columnName": "publicKeysEncrypted",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isObsolete",
+            "columnName": "isObsolete",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "changeId"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SelfAuditResultEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`userId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "NotificationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`notificationId` TEXT NOT NULL, `userId` TEXT NOT NULL, `time` INTEGER NOT NULL, `type` TEXT NOT NULL, `payload` TEXT NOT NULL, PRIMARY KEY(`userId`, `notificationId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "notificationId",
+            "columnName": "notificationId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "time",
+            "columnName": "time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "payload",
+            "columnName": "payload",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "notificationId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_NotificationEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_NotificationEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_NotificationEntity_notificationId",
+            "unique": false,
+            "columnNames": [
+              "notificationId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_NotificationEntity_notificationId` ON `${TABLE_NAME}` (`notificationId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PushEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `pushId` TEXT NOT NULL, `objectId` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`userId`, `pushId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pushId",
+            "columnName": "pushId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "objectId",
+            "columnName": "objectId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "pushId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PushEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PushEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_PushEntity_type",
+            "unique": false,
+            "columnNames": [
+              "type"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PushEntity_type` ON `${TABLE_NAME}` (`type`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TelemetryEventEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` TEXT, `group` TEXT NOT NULL, `name` TEXT NOT NULL, `values` TEXT NOT NULL, `dimensions` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "values",
+            "columnName": "values",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dimensions",
+            "columnName": "dimensions",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TelemetryEventEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TelemetryEventEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ContactCardEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`contactId` TEXT NOT NULL, `type` INTEGER NOT NULL, `data` TEXT NOT NULL, `signature` TEXT, `cardId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, FOREIGN KEY(`contactId`) REFERENCES `ContactEntity`(`contactId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "contactId",
+            "columnName": "contactId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "signature",
+            "columnName": "signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "cardId",
+            "columnName": "cardId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "cardId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ContactCardEntity_contactId",
+            "unique": false,
+            "columnNames": [
+              "contactId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ContactCardEntity_contactId` ON `${TABLE_NAME}` (`contactId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "ContactEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "contactId"
+            ],
+            "referencedColumns": [
+              "contactId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ContactEmailEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `contactEmailId` TEXT NOT NULL, `name` TEXT NOT NULL, `email` TEXT NOT NULL, `defaults` INTEGER NOT NULL, `order` INTEGER NOT NULL, `contactId` TEXT NOT NULL, `canonicalEmail` TEXT, `isProton` INTEGER, `lastUsedTime` INTEGER NOT NULL, PRIMARY KEY(`contactEmailId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`contactId`) REFERENCES `ContactEntity`(`contactId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contactEmailId",
+            "columnName": "contactEmailId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "defaults",
+            "columnName": "defaults",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "order",
+            "columnName": "order",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contactId",
+            "columnName": "contactId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canonicalEmail",
+            "columnName": "canonicalEmail",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isProton",
+            "columnName": "isProton",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastUsedTime",
+            "columnName": "lastUsedTime",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "contactEmailId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ContactEmailEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ContactEmailEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_ContactEmailEntity_contactId",
+            "unique": false,
+            "columnNames": [
+              "contactId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ContactEmailEntity_contactId` ON `${TABLE_NAME}` (`contactId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ContactEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "contactId"
+            ],
+            "referencedColumns": [
+              "contactId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ContactEmailLabelEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`contactEmailId` TEXT NOT NULL, `labelId` TEXT NOT NULL, PRIMARY KEY(`contactEmailId`, `labelId`), FOREIGN KEY(`contactEmailId`) REFERENCES `ContactEmailEntity`(`contactEmailId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "contactEmailId",
+            "columnName": "contactEmailId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "labelId",
+            "columnName": "labelId",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "contactEmailId",
+            "labelId"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "ContactEmailEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "contactEmailId"
+            ],
+            "referencedColumns": [
+              "contactEmailId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ContactEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `contactId` TEXT NOT NULL, `name` TEXT NOT NULL, PRIMARY KEY(`contactId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contactId",
+            "columnName": "contactId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "contactId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ContactEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ContactEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "RecoveryFileEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `createdAtUtcMillis` INTEGER NOT NULL, `keyCount` INTEGER, `recoveryFile` TEXT NOT NULL, `recoverySecretHash` TEXT NOT NULL, PRIMARY KEY(`recoverySecretHash`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAtUtcMillis",
+            "columnName": "createdAtUtcMillis",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyCount",
+            "columnName": "keyCount",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "recoveryFile",
+            "columnName": "recoveryFile",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recoverySecretHash",
+            "columnName": "recoverySecretHash",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "recoverySecretHash"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_RecoveryFileEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RecoveryFileEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PublicAddressInfoEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `warnings` TEXT NOT NULL, `protonMx` INTEGER NOT NULL, `isProton` INTEGER NOT NULL, `addressSignedKeyList_data` TEXT, `addressSignedKeyList_signature` TEXT, `addressSignedKeyList_minEpochId` INTEGER, `addressSignedKeyList_maxEpochId` INTEGER, `addressSignedKeyList_expectedMinEpochId` INTEGER, `catchAllSignedKeyList_data` TEXT, `catchAllSignedKeyList_signature` TEXT, `catchAllSignedKeyList_minEpochId` INTEGER, `catchAllSignedKeyList_maxEpochId` INTEGER, `catchAllSignedKeyList_expectedMinEpochId` INTEGER, PRIMARY KEY(`email`))",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "warnings",
+            "columnName": "warnings",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "protonMx",
+            "columnName": "protonMx",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isProton",
+            "columnName": "isProton",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addressSignedKeyList.data",
+            "columnName": "addressSignedKeyList_data",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "addressSignedKeyList.signature",
+            "columnName": "addressSignedKeyList_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "addressSignedKeyList.minEpochId",
+            "columnName": "addressSignedKeyList_minEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "addressSignedKeyList.maxEpochId",
+            "columnName": "addressSignedKeyList_maxEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "addressSignedKeyList.expectedMinEpochId",
+            "columnName": "addressSignedKeyList_expectedMinEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "catchAllSignedKeyList.data",
+            "columnName": "catchAllSignedKeyList_data",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "catchAllSignedKeyList.signature",
+            "columnName": "catchAllSignedKeyList_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "catchAllSignedKeyList.minEpochId",
+            "columnName": "catchAllSignedKeyList_minEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "catchAllSignedKeyList.maxEpochId",
+            "columnName": "catchAllSignedKeyList_maxEpochId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "catchAllSignedKeyList.expectedMinEpochId",
+            "columnName": "catchAllSignedKeyList_expectedMinEpochId",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "email"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PublicAddressInfoEntity_email",
+            "unique": false,
+            "columnNames": [
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PublicAddressInfoEntity_email` ON `${TABLE_NAME}` (`email`)"
+          }
+        ]
+      },
+      {
+        "tableName": "PublicAddressKeyDataEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `emailAddressType` INTEGER NOT NULL, `flags` INTEGER NOT NULL, `publicKey` TEXT NOT NULL, `isPrimary` INTEGER NOT NULL, `source` INTEGER, PRIMARY KEY(`email`, `publicKey`), FOREIGN KEY(`email`) REFERENCES `PublicAddressInfoEntity`(`email`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "emailAddressType",
+            "columnName": "emailAddressType",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicKey",
+            "columnName": "publicKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPrimary",
+            "columnName": "isPrimary",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "email",
+            "publicKey"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PublicAddressKeyDataEntity_email",
+            "unique": false,
+            "columnNames": [
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PublicAddressKeyDataEntity_email` ON `${TABLE_NAME}` (`email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "PublicAddressInfoEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "email"
+            ],
+            "referencedColumns": [
+              "email"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LabelEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `labelId` TEXT NOT NULL, `parentId` TEXT, `name` TEXT NOT NULL, `type` INTEGER NOT NULL, `path` TEXT NOT NULL, `color` TEXT NOT NULL, `order` INTEGER NOT NULL, `isNotified` INTEGER, `isExpanded` INTEGER, `isSticky` INTEGER, PRIMARY KEY(`userId`, `labelId`), FOREIGN KEY(`userId`) REFERENCES `UserEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "labelId",
+            "columnName": "labelId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "path",
+            "columnName": "path",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "order",
+            "columnName": "order",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "isNotified",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "isExpanded",
+            "columnName": "isExpanded",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "isSticky",
+            "columnName": "isSticky",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "labelId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LabelEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LabelEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_LabelEntity_labelId",
+            "unique": false,
+            "columnNames": [
+              "labelId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LabelEntity_labelId` ON `${TABLE_NAME}` (`labelId`)"
+          },
+          {
+            "name": "index_LabelEntity_parentId",
+            "unique": false,
+            "columnNames": [
+              "parentId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LabelEntity_parentId` ON `${TABLE_NAME}` (`parentId`)"
+          },
+          {
+            "name": "index_LabelEntity_name",
+            "unique": false,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LabelEntity_name` ON `${TABLE_NAME}` (`name`)"
+          },
+          {
+            "name": "index_LabelEntity_type",
+            "unique": false,
+            "columnNames": [
+              "type"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LabelEntity_type` ON `${TABLE_NAME}` (`type`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UserEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AuthDeviceEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `deviceId` TEXT NOT NULL, `addressId` TEXT, `state` INTEGER NOT NULL, `name` TEXT NOT NULL, `localizedClientName` TEXT NOT NULL, `platform` TEXT, `createdAtUtcSeconds` INTEGER NOT NULL, `activatedAtUtcSeconds` INTEGER, `rejectedAtUtcSeconds` INTEGER, `activationToken` TEXT, `lastActivityAtUtcSeconds` INTEGER NOT NULL, PRIMARY KEY(`userId`, `deviceId`), FOREIGN KEY(`userId`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "deviceId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addressId",
+            "columnName": "addressId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localizedClientName",
+            "columnName": "localizedClientName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "platform",
+            "columnName": "platform",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "createdAtUtcSeconds",
+            "columnName": "createdAtUtcSeconds",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activatedAtUtcSeconds",
+            "columnName": "activatedAtUtcSeconds",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "rejectedAtUtcSeconds",
+            "columnName": "rejectedAtUtcSeconds",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "activationToken",
+            "columnName": "activationToken",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "lastActivityAtUtcSeconds",
+            "columnName": "lastActivityAtUtcSeconds",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "deviceId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AuthDeviceEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AuthDeviceEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_AuthDeviceEntity_addressId",
+            "unique": false,
+            "columnNames": [
+              "addressId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AuthDeviceEntity_addressId` ON `${TABLE_NAME}` (`addressId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DeviceSecretEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `deviceId` TEXT NOT NULL, `secret` TEXT NOT NULL, `token` TEXT NOT NULL, PRIMARY KEY(`userId`), FOREIGN KEY(`userId`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "deviceId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secret",
+            "columnName": "secret",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "token",
+            "columnName": "token",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_DeviceSecretEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceSecretEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "MemberDeviceEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `deviceId` TEXT NOT NULL, `memberId` TEXT NOT NULL, `addressId` TEXT, `state` INTEGER NOT NULL, `name` TEXT NOT NULL, `localizedClientName` TEXT NOT NULL, `platform` TEXT, `createdAtUtcSeconds` INTEGER NOT NULL, `activatedAtUtcSeconds` INTEGER, `rejectedAtUtcSeconds` INTEGER, `activationToken` TEXT, `lastActivityAtUtcSeconds` INTEGER NOT NULL, PRIMARY KEY(`userId`, `deviceId`), FOREIGN KEY(`userId`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "deviceId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "memberId",
+            "columnName": "memberId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addressId",
+            "columnName": "addressId",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localizedClientName",
+            "columnName": "localizedClientName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "platform",
+            "columnName": "platform",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "createdAtUtcSeconds",
+            "columnName": "createdAtUtcSeconds",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activatedAtUtcSeconds",
+            "columnName": "activatedAtUtcSeconds",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "rejectedAtUtcSeconds",
+            "columnName": "rejectedAtUtcSeconds",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "activationToken",
+            "columnName": "activationToken",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "lastActivityAtUtcSeconds",
+            "columnName": "lastActivityAtUtcSeconds",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "deviceId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_MemberDeviceEntity_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_MemberDeviceEntity_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_MemberDeviceEntity_memberId",
+            "unique": false,
+            "columnNames": [
+              "memberId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_MemberDeviceEntity_memberId` ON `${TABLE_NAME}` (`memberId`)"
+          },
+          {
+            "name": "index_MemberDeviceEntity_addressId",
+            "unique": false,
+            "columnNames": [
+              "addressId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_MemberDeviceEntity_addressId` ON `${TABLE_NAME}` (`addressId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "VolumeEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `create_time` INTEGER NOT NULL, `used_space` INTEGER NOT NULL, `state` INTEGER NOT NULL, `type` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "usedSpace",
+            "columnName": "used_space",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_VolumeEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_VolumeEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_VolumeEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_VolumeEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_VolumeEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_VolumeEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_VolumeEntity_type",
+            "unique": false,
+            "columnNames": [
+              "type"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_VolumeEntity_type` ON `${TABLE_NAME}` (`type`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ShareEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `volume_type` INTEGER, `address_id` TEXT, `flags` INTEGER NOT NULL, `link_id` TEXT NOT NULL, `locked` INTEGER NOT NULL, `key` TEXT NOT NULL, `passphrase` TEXT NOT NULL, `passphrase_signature` TEXT NOT NULL, `creation_time` INTEGER, `type` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeType",
+            "columnName": "volume_type",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "addressId",
+            "columnName": "address_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isLocked",
+            "columnName": "locked",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "passphrase",
+            "columnName": "passphrase",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "passphraseSignature",
+            "columnName": "passphrase_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creationTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ShareEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_ShareEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_ShareEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_ShareEntity_id",
+            "unique": true,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ShareEntity_id` ON `${TABLE_NAME}` (`id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ShareUrlEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `flags` INTEGER NOT NULL, `name` TEXT, `token` TEXT NOT NULL, `creator_email` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `creation_time` INTEGER NOT NULL, `expiration_time` INTEGER, `last_access_time` INTEGER, `max_accesses` INTEGER, `number_of_accesses` INTEGER NOT NULL, `url_password_salt` TEXT NOT NULL, `share_password_salt` TEXT NOT NULL, `srp_verifier` TEXT NOT NULL, `srp_modulus_id` TEXT NOT NULL, `password` TEXT NOT NULL, `share_passphrase_key_packet` TEXT NOT NULL, `public_url` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "flags",
+            "columnName": "flags",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "token",
+            "columnName": "token",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creatorEmail",
+            "columnName": "creator_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creationTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "expirationTime",
+            "columnName": "expiration_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastAccessTime",
+            "columnName": "last_access_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "maxAccesses",
+            "columnName": "max_accesses",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "numberOfAccesses",
+            "columnName": "number_of_accesses",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "urlPasswordSalt",
+            "columnName": "url_password_salt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharePasswordSalt",
+            "columnName": "share_password_salt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "srpVerifier",
+            "columnName": "srp_verifier",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "srpModulusId",
+            "columnName": "srp_modulus_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "encryptedUrlPassword",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sharePassphraseKeyPacket",
+            "columnName": "share_passphrase_key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicUrl",
+            "columnName": "public_url",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ShareUrlEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareUrlEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_ShareUrlEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareUrlEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_ShareUrlEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareUrlEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_ShareUrlEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareUrlEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ShareExternalInvitationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `inviter_email` TEXT NOT NULL, `invitee_email` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `signature` TEXT NOT NULL, `state` INTEGER NOT NULL, `create_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviterEmail",
+            "columnName": "inviter_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviteeEmail",
+            "columnName": "invitee_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "signature",
+            "columnName": "signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ShareExternalInvitationEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareExternalInvitationEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_ShareExternalInvitationEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareExternalInvitationEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_ShareExternalInvitationEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareExternalInvitationEntity_id` ON `${TABLE_NAME}` (`id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ShareInvitationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `inviter_email` TEXT NOT NULL, `invitee_email` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `key_packet` TEXT NOT NULL, `key_packet_signature` TEXT NOT NULL, `create_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviterEmail",
+            "columnName": "inviter_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviteeEmail",
+            "columnName": "invitee_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacket",
+            "columnName": "key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacketSignature",
+            "columnName": "key_packet_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ShareInvitationEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareInvitationEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_ShareInvitationEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareInvitationEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_ShareInvitationEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareInvitationEntity_id` ON `${TABLE_NAME}` (`id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ShareMemberEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `inviter_email` TEXT NOT NULL, `invitee_email` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `key_packet` TEXT NOT NULL, `key_packet_signature` TEXT, `session_key_signature` TEXT, `create_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviterEmail",
+            "columnName": "inviter_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviteeEmail",
+            "columnName": "invitee_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacket",
+            "columnName": "key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacketSignature",
+            "columnName": "key_packet_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "sessionKeySignature",
+            "columnName": "session_key_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ShareMemberEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareMemberEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_ShareMemberEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareMemberEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_ShareMemberEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareMemberEntity_id` ON `${TABLE_NAME}` (`id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ShareMembershipEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `inviter_email` TEXT NOT NULL, `invitee_email` TEXT NOT NULL, `address_id` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `key_packet` TEXT NOT NULL, `key_packet_signature` TEXT, `session_key_signature` TEXT, `create_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviterEmail",
+            "columnName": "inviter_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviteeEmail",
+            "columnName": "invitee_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addressId",
+            "columnName": "address_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacket",
+            "columnName": "key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacketSignature",
+            "columnName": "key_packet_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "sessionKeySignature",
+            "columnName": "session_key_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ShareMembershipEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareMembershipEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_ShareMembershipEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareMembershipEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_ShareMembershipEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ShareMembershipEntity_id` ON `${TABLE_NAME}` (`id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UserInvitationDetailsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `id` TEXT NOT NULL, `inviter_email` TEXT NOT NULL, `invitee_email` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `key_packet` TEXT NOT NULL, `key_packet_signature` TEXT NOT NULL, `create_time` INTEGER NOT NULL, `passphrase` TEXT NOT NULL, `share_key` TEXT NOT NULL, `creator_email` TEXT NOT NULL, `type` INTEGER NOT NULL, `link_id` TEXT NOT NULL, `name` TEXT NOT NULL, `mime_type` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `id`) REFERENCES `UserInvitationIdEntity`(`user_id`, `volume_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviterEmail",
+            "columnName": "inviter_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inviteeEmail",
+            "columnName": "invitee_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacket",
+            "columnName": "key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyPacketSignature",
+            "columnName": "key_packet_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "passphrase",
+            "columnName": "passphrase",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareKey",
+            "columnName": "share_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creatorEmail",
+            "columnName": "creator_email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mime_type",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UserInvitationDetailsEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UserInvitationDetailsEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "UserInvitationIdEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UserInvitationIdEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `type` INTEGER, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UserInvitationIdEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UserInvitationIdEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `parent_id` TEXT, `type` INTEGER NOT NULL, `name` TEXT NOT NULL, `name_signature_email` TEXT, `hash` TEXT NOT NULL, `state` INTEGER NOT NULL, `expiration_time` INTEGER, `size` INTEGER NOT NULL, `mime_type` TEXT NOT NULL, `attributes` INTEGER NOT NULL, `permissions` INTEGER NOT NULL, `node_key` TEXT NOT NULL, `node_passphrase` TEXT NOT NULL, `node_passphrase_signature` TEXT NOT NULL, `signature_address` TEXT NOT NULL, `creation_time` INTEGER NOT NULL, `last_modified` INTEGER NOT NULL, `trashed_time` INTEGER, `is_shared` INTEGER NOT NULL, `number_of_accesses` INTEGER NOT NULL, `share_url_expiration_time` INTEGER, `x_attr` TEXT, `share_url_share_id` TEXT DEFAULT NULL, `share_url_id` TEXT DEFAULT NULL, PRIMARY KEY(`user_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nameSignatureEmail",
+            "columnName": "name_signature_email",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "expirationTime",
+            "columnName": "expiration_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mime_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attributes",
+            "columnName": "attributes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "permissions",
+            "columnName": "permissions",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodeKey",
+            "columnName": "node_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodePassphrase",
+            "columnName": "node_passphrase",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodePassphraseSignature",
+            "columnName": "node_passphrase_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "signatureAddress",
+            "columnName": "signature_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creationTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastModified",
+            "columnName": "last_modified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "trashedTime",
+            "columnName": "trashed_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "shared",
+            "columnName": "is_shared",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "numberOfAccesses",
+            "columnName": "number_of_accesses",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareUrlExpirationTime",
+            "columnName": "share_url_expiration_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "xAttr",
+            "columnName": "x_attr",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "sharingDetailsShareId",
+            "columnName": "share_url_share_id",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "shareUrlId",
+            "columnName": "share_url_id",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_LinkEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_LinkEntity_parent_id",
+            "unique": false,
+            "columnNames": [
+              "parent_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_parent_id` ON `${TABLE_NAME}` (`parent_id`)"
+          },
+          {
+            "name": "index_LinkEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_LinkEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_LinkEntity_user_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_user_id_id` ON `${TABLE_NAME}` (`user_id`, `id`)"
+          },
+          {
+            "name": "index_LinkEntity_user_id_share_id_parent_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkEntity_user_id_share_id_parent_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `parent_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkFilePropertiesEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`file_user_id` TEXT NOT NULL, `file_share_id` TEXT NOT NULL, `file_link_id` TEXT NOT NULL, `revision_id` TEXT NOT NULL, `has_thumbnail` INTEGER NOT NULL, `content_key_packet` TEXT NOT NULL, `content_key_packet_signature` TEXT, `file_signature_address` TEXT, `capture_time` INTEGER DEFAULT NULL, `content_hash` TEXT DEFAULT NULL, `main_photo_link_id` TEXT DEFAULT NULL, `thumbnail_id_default` TEXT, `thumbnail_id_photo` TEXT, `checksum_verified` INTEGER NOT NULL, PRIMARY KEY(`file_user_id`, `file_share_id`, `file_link_id`), FOREIGN KEY(`file_user_id`, `file_share_id`, `file_link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "file_user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "file_share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "file_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeRevisionId",
+            "columnName": "revision_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasThumbnail",
+            "columnName": "has_thumbnail",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contentKeyPacket",
+            "columnName": "content_key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contentKeyPacketSignature",
+            "columnName": "content_key_packet_signature",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "activeRevisionSignatureAddress",
+            "columnName": "file_signature_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photoCaptureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "photoContentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "mainPhotoLinkId",
+            "columnName": "main_photo_link_id",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "defaultThumbnailId",
+            "columnName": "thumbnail_id_default",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photoThumbnailId",
+            "columnName": "thumbnail_id_photo",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "activeRevisionChecksumVerified",
+            "columnName": "checksum_verified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "file_user_id",
+            "file_share_id",
+            "file_link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkFilePropertiesEntity_file_share_id",
+            "unique": false,
+            "columnNames": [
+              "file_share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFilePropertiesEntity_file_share_id` ON `${TABLE_NAME}` (`file_share_id`)"
+          },
+          {
+            "name": "index_LinkFilePropertiesEntity_file_link_id",
+            "unique": false,
+            "columnNames": [
+              "file_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFilePropertiesEntity_file_link_id` ON `${TABLE_NAME}` (`file_link_id`)"
+          },
+          {
+            "name": "index_LinkFilePropertiesEntity_revision_id",
+            "unique": false,
+            "columnNames": [
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFilePropertiesEntity_revision_id` ON `${TABLE_NAME}` (`revision_id`)"
+          },
+          {
+            "name": "index_LinkFilePropertiesEntity_file_user_id_file_share_id_file_link_id",
+            "unique": false,
+            "columnNames": [
+              "file_user_id",
+              "file_share_id",
+              "file_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFilePropertiesEntity_file_user_id_file_share_id_file_link_id` ON `${TABLE_NAME}` (`file_user_id`, `file_share_id`, `file_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "file_user_id",
+              "file_share_id",
+              "file_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkFolderPropertiesEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`folder_user_id` TEXT NOT NULL, `folder_share_id` TEXT NOT NULL, `folder_link_id` TEXT NOT NULL, `node_hash_key` TEXT NOT NULL, PRIMARY KEY(`folder_user_id`, `folder_share_id`, `folder_link_id`), FOREIGN KEY(`folder_user_id`, `folder_share_id`, `folder_link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "folder_user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "folder_share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "folder_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodeHashKey",
+            "columnName": "node_hash_key",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "folder_user_id",
+            "folder_share_id",
+            "folder_link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkFolderPropertiesEntity_folder_share_id",
+            "unique": false,
+            "columnNames": [
+              "folder_share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFolderPropertiesEntity_folder_share_id` ON `${TABLE_NAME}` (`folder_share_id`)"
+          },
+          {
+            "name": "index_LinkFolderPropertiesEntity_folder_link_id",
+            "unique": false,
+            "columnNames": [
+              "folder_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFolderPropertiesEntity_folder_link_id` ON `${TABLE_NAME}` (`folder_link_id`)"
+          },
+          {
+            "name": "index_LinkFolderPropertiesEntity_folder_user_id_folder_share_id_folder_link_id",
+            "unique": false,
+            "columnNames": [
+              "folder_user_id",
+              "folder_share_id",
+              "folder_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkFolderPropertiesEntity_folder_user_id_folder_share_id_folder_link_id` ON `${TABLE_NAME}` (`folder_user_id`, `folder_share_id`, `folder_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "folder_user_id",
+              "folder_share_id",
+              "folder_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkAlbumPropertiesEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`album_user_id` TEXT NOT NULL, `album_share_id` TEXT NOT NULL, `album_link_id` TEXT NOT NULL, `album_node_hash_key` TEXT NOT NULL, `locked` INTEGER NOT NULL, `last_activity_time` INTEGER NOT NULL, `count` INTEGER NOT NULL, `cover_link_id` TEXT, PRIMARY KEY(`album_user_id`, `album_share_id`, `album_link_id`), FOREIGN KEY(`album_user_id`, `album_share_id`, `album_link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "album_user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "album_share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "album_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodeHashKey",
+            "columnName": "album_node_hash_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locked",
+            "columnName": "locked",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastActivityTime",
+            "columnName": "last_activity_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "photoCount",
+            "columnName": "count",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "coverLinkId",
+            "columnName": "cover_link_id",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "album_user_id",
+            "album_share_id",
+            "album_link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkAlbumPropertiesEntity_album_share_id",
+            "unique": false,
+            "columnNames": [
+              "album_share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkAlbumPropertiesEntity_album_share_id` ON `${TABLE_NAME}` (`album_share_id`)"
+          },
+          {
+            "name": "index_LinkAlbumPropertiesEntity_album_link_id",
+            "unique": false,
+            "columnNames": [
+              "album_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkAlbumPropertiesEntity_album_link_id` ON `${TABLE_NAME}` (`album_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "album_user_id",
+              "album_share_id",
+              "album_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkTagEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag_user_id` TEXT NOT NULL, `tag_share_id` TEXT NOT NULL, `tag_link_id` TEXT NOT NULL, `tag` INTEGER NOT NULL, PRIMARY KEY(`tag_user_id`, `tag_share_id`, `tag_link_id`, `tag`), FOREIGN KEY(`tag_user_id`, `tag_share_id`, `tag_link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "tag_user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "tag_share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "tag_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "tag_user_id",
+            "tag_share_id",
+            "tag_link_id",
+            "tag"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkTagEntity_tag_share_id_tag_link_id",
+            "unique": false,
+            "columnNames": [
+              "tag_share_id",
+              "tag_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTagEntity_tag_share_id_tag_link_id` ON `${TABLE_NAME}` (`tag_share_id`, `tag_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "tag_user_id",
+              "tag_share_id",
+              "tag_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkOfflineEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkOfflineEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkOfflineEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_LinkOfflineEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkOfflineEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_LinkOfflineEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkOfflineEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_LinkOfflineEntity_user_id_share_id_link_id",
+            "unique": true,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_LinkOfflineEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkDownloadStateEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `revision_id` TEXT NOT NULL, `state` TEXT NOT NULL, `manifest_signature` TEXT DEFAULT NULL, `signature_address` TEXT DEFAULT NULL, PRIMARY KEY(`user_id`, `share_id`, `link_id`, `revision_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "revisionId",
+            "columnName": "revision_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "manifestSignature",
+            "columnName": "manifest_signature",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "signatureAddress",
+            "columnName": "signature_address",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id",
+            "revision_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkDownloadStateEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_revision_id",
+            "unique": false,
+            "columnNames": [
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_revision_id` ON `${TABLE_NAME}` (`revision_id`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_state",
+            "unique": false,
+            "columnNames": [
+              "state"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_state` ON `${TABLE_NAME}` (`state`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_user_id_state",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "state"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_user_id_state` ON `${TABLE_NAME}` (`user_id`, `state`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_user_id_share_id_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          },
+          {
+            "name": "index_LinkDownloadStateEntity_user_id_share_id_link_id_revision_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id",
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkDownloadStateEntity_user_id_share_id_link_id_revision_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`, `revision_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkDownloadFileSignatureVerificationFailedEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DownloadBlockEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `revision_id` TEXT NOT NULL, `index` INTEGER NOT NULL, `uri` TEXT NOT NULL, `encrypted_signature` TEXT, PRIMARY KEY(`user_id`, `share_id`, `link_id`, `revision_id`, `index`), FOREIGN KEY(`user_id`, `share_id`, `link_id`, `revision_id`) REFERENCES `LinkDownloadStateEntity`(`user_id`, `share_id`, `link_id`, `revision_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "revisionId",
+            "columnName": "revision_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "index",
+            "columnName": "index",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uri",
+            "columnName": "uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "encryptedSignature",
+            "columnName": "encrypted_signature",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id",
+            "revision_id",
+            "index"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_DownloadBlockEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DownloadBlockEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_DownloadBlockEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DownloadBlockEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_DownloadBlockEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DownloadBlockEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_DownloadBlockEntity_revision_id",
+            "unique": false,
+            "columnNames": [
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DownloadBlockEntity_revision_id` ON `${TABLE_NAME}` (`revision_id`)"
+          },
+          {
+            "name": "index_DownloadBlockEntity_user_id_share_id_link_id_revision_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id",
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DownloadBlockEntity_user_id_share_id_link_id_revision_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`, `revision_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkDownloadStateEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id",
+              "revision_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "link_id",
+              "revision_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkTrashStateEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `state` TEXT NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkTrashStateEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTrashStateEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_LinkTrashStateEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTrashStateEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_LinkTrashStateEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTrashStateEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_LinkTrashStateEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTrashStateEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_LinkTrashStateEntity_state",
+            "unique": false,
+            "columnNames": [
+              "state"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTrashStateEntity_state` ON `${TABLE_NAME}` (`state`)"
+          },
+          {
+            "name": "index_LinkTrashStateEntity_user_id_share_id_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkTrashStateEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "FileDownloadEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `link_id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `revision_id` TEXT NOT NULL, `priority` INTEGER NOT NULL, `retryable` INTEGER NOT NULL, `state` TEXT NOT NULL, `parent_id` TEXT, `number_of_retries` INTEGER NOT NULL, `run_at` INTEGER, `network_type` TEXT NOT NULL, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fileId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "revisionId",
+            "columnName": "revision_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "retryable",
+            "columnName": "retryable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "numberOfRetries",
+            "columnName": "number_of_retries",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastRunTimestamp",
+            "columnName": "run_at",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "networkType",
+            "columnName": "network_type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_FileDownloadEntity_user_id_volume_id_share_id_link_id_revision_id",
+            "unique": true,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "link_id",
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_FileDownloadEntity_user_id_volume_id_share_id_link_id_revision_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `link_id`, `revision_id`)"
+          },
+          {
+            "name": "index_FileDownloadEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_FileDownloadEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_FileDownloadEntity_priority",
+            "unique": false,
+            "columnNames": [
+              "priority"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_FileDownloadEntity_priority` ON `${TABLE_NAME}` (`priority`)"
+          },
+          {
+            "name": "index_FileDownloadEntity_user_id_state",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "state"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_FileDownloadEntity_user_id_state` ON `${TABLE_NAME}` (`user_id`, `state`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ParentLinkDownloadEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `link_id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `type` INTEGER NOT NULL, `priority` INTEGER NOT NULL, `retryable` INTEGER NOT NULL, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkType",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "retryable",
+            "columnName": "retryable",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ParentLinkDownloadEntity_user_id_volume_id_share_id_link_id",
+            "unique": true,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ParentLinkDownloadEntity_user_id_volume_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `link_id`)"
+          },
+          {
+            "name": "index_ParentLinkDownloadEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_ParentLinkDownloadEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TrashWorkEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `work_id` TEXT NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "workId",
+            "columnName": "work_id",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TrashWorkEntity_user_id_share_id_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TrashWorkEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          },
+          {
+            "name": "index_TrashWorkEntity_work_id",
+            "unique": false,
+            "columnNames": [
+              "work_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TrashWorkEntity_work_id` ON `${TABLE_NAME}` (`work_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "MessageEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `user_id` TEXT NOT NULL, `content` TEXT NOT NULL, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_MessageEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_MessageEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UiSettingsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `layout_type` TEXT NOT NULL, `theme_style` TEXT NOT NULL, `home_tab` TEXT DEFAULT NULL, PRIMARY KEY(`user_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "layoutType",
+            "columnName": "layout_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "themeStyle",
+            "columnName": "theme_style",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "homeTab",
+            "columnName": "home_tab",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DriveLinkRemoteKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `user_id` TEXT NOT NULL, `previous_key` INTEGER, `next_key` INTEGER, PRIMARY KEY(`key`, `user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "prevKey",
+            "columnName": "previous_key",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "nextKey",
+            "columnName": "next_key",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key",
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_DriveLinkRemoteKeyEntity_user_id_share_id_link_id",
+            "unique": true,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_DriveLinkRemoteKeyEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          },
+          {
+            "name": "index_DriveLinkRemoteKeyEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DriveLinkRemoteKeyEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_DriveLinkRemoteKeyEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DriveLinkRemoteKeyEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_DriveLinkRemoteKeyEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DriveLinkRemoteKeyEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_DriveLinkRemoteKeyEntity_key",
+            "unique": false,
+            "columnNames": [
+              "key"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DriveLinkRemoteKeyEntity_key` ON `${TABLE_NAME}` (`key`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SortingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `sorting_by` TEXT NOT NULL, `sorting_direction` TEXT NOT NULL, PRIMARY KEY(`user_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sortingBy",
+            "columnName": "sorting_by",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sortingDirection",
+            "columnName": "sorting_direction",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkUploadEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `revision_id` TEXT NOT NULL, `name` TEXT NOT NULL, `mime_type` TEXT NOT NULL, `node_key` TEXT NOT NULL, `node_passphrase` TEXT NOT NULL, `node_passphrase_signature` TEXT NOT NULL, `content_key_packet` TEXT NOT NULL, `content_key_packet_signature` TEXT NOT NULL, `manifest_signature` TEXT NOT NULL, `state` TEXT NOT NULL, `size` INTEGER DEFAULT NULL, `last_modified` INTEGER, `uri` TEXT DEFAULT NULL, `should_delete_source_uri` INTEGER NOT NULL DEFAULT false, `media_resolution_width` INTEGER DEFAULT NULL, `media_resolution_height` INTEGER DEFAULT NULL, `digests` TEXT DEFAULT NULL, `network_type_provider_type` TEXT NOT NULL DEFAULT 'DEFAULT', `duration` INTEGER DEFAULT NULL, `latitude` REAL DEFAULT NULL, `longitude` REAL DEFAULT NULL, `creation_time` INTEGER DEFAULT NULL, `model` TEXT DEFAULT NULL, `orientation` INTEGER DEFAULT NULL, `subject_area` TEXT DEFAULT NULL, `should_announce_event` INTEGER NOT NULL DEFAULT true, `cache_option` TEXT NOT NULL DEFAULT 'ALL', `priority` INTEGER NOT NULL DEFAULT 9223372036854775807, `upload_creation_time` INTEGER, `should_broadcast_error_message` INTEGER NOT NULL DEFAULT true, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "revisionId",
+            "columnName": "revision_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mime_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodeKey",
+            "columnName": "node_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodePassphrase",
+            "columnName": "node_passphrase",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nodePassphraseSignature",
+            "columnName": "node_passphrase_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contentKeyPacket",
+            "columnName": "content_key_packet",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contentKeyPacketSignature",
+            "columnName": "content_key_packet_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "manifestSignature",
+            "columnName": "manifest_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "lastModified",
+            "columnName": "last_modified",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "uri",
+            "columnName": "uri",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "shouldDeleteSourceUri",
+            "columnName": "should_delete_source_uri",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "mediaResolutionWidth",
+            "columnName": "media_resolution_width",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "mediaResolutionHeight",
+            "columnName": "media_resolution_height",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "digests",
+            "columnName": "digests",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "networkTypeProviderType",
+            "columnName": "network_type_provider_type",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'DEFAULT'"
+          },
+          {
+            "fieldPath": "mediaDuration",
+            "columnName": "duration",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "latitude",
+            "columnName": "latitude",
+            "affinity": "REAL",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "longitude",
+            "columnName": "longitude",
+            "affinity": "REAL",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "cameraCreationDateTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "cameraModel",
+            "columnName": "model",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "cameraOrientation",
+            "columnName": "orientation",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "cameraSubjectArea",
+            "columnName": "subject_area",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "shouldAnnounceEvent",
+            "columnName": "should_announce_event",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          },
+          {
+            "fieldPath": "cacheOption",
+            "columnName": "cache_option",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'ALL'"
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "9223372036854775807"
+          },
+          {
+            "fieldPath": "uploadCreationDateTime",
+            "columnName": "upload_creation_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "shouldBroadcastErrorMessage",
+            "columnName": "should_broadcast_error_message",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkUploadEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkUploadEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_LinkUploadEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkUploadEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_LinkUploadEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkUploadEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_LinkUploadEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkUploadEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_LinkUploadEntity_revision_id",
+            "unique": false,
+            "columnNames": [
+              "revision_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkUploadEntity_revision_id` ON `${TABLE_NAME}` (`revision_id`)"
+          },
+          {
+            "name": "index_LinkUploadEntity_parent_id",
+            "unique": false,
+            "columnNames": [
+              "parent_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkUploadEntity_parent_id` ON `${TABLE_NAME}` (`parent_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UploadBlockEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`upload_link_id` INTEGER NOT NULL, `index` INTEGER NOT NULL, `size` INTEGER NOT NULL, `encrypted_signature` TEXT NOT NULL, `hash` TEXT NOT NULL, `token` TEXT NOT NULL, `url` TEXT NOT NULL, `raw_size` INTEGER NOT NULL DEFAULT 0, `type` TEXT NOT NULL DEFAULT 'FILE', `verifier_token` TEXT DEFAULT NULL, PRIMARY KEY(`upload_link_id`, `index`), FOREIGN KEY(`upload_link_id`) REFERENCES `LinkUploadEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "uploadLinkId",
+            "columnName": "upload_link_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "index",
+            "columnName": "index",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "encryptedSignature",
+            "columnName": "encrypted_signature",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uploadToken",
+            "columnName": "token",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "rawSize",
+            "columnName": "raw_size",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'FILE'"
+          },
+          {
+            "fieldPath": "verifierToken",
+            "columnName": "verifier_token",
+            "affinity": "TEXT",
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "upload_link_id",
+            "index"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "LinkUploadEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "upload_link_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UploadBulkEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `should_delete_source_uri` INTEGER NOT NULL, `network_type_provider_type` TEXT NOT NULL DEFAULT 'DEFAULT', `should_announce_event` INTEGER NOT NULL DEFAULT true, `cache_option` TEXT NOT NULL DEFAULT 'ALL', `priority` INTEGER NOT NULL DEFAULT 9223372036854775807, `should_broadcast_error_message` INTEGER NOT NULL DEFAULT true, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shouldDeleteSourceUri",
+            "columnName": "should_delete_source_uri",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "networkTypeProviderType",
+            "columnName": "network_type_provider_type",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'DEFAULT'"
+          },
+          {
+            "fieldPath": "shouldAnnounceEvent",
+            "columnName": "should_announce_event",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          },
+          {
+            "fieldPath": "cacheOption",
+            "columnName": "cache_option",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'ALL'"
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "9223372036854775807"
+          },
+          {
+            "fieldPath": "shouldBroadcastErrorMessage",
+            "columnName": "should_broadcast_error_message",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UploadBulkEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UploadBulkEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_UploadBulkEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UploadBulkEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_UploadBulkEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UploadBulkEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_UploadBulkEntity_parent_id",
+            "unique": false,
+            "columnNames": [
+              "parent_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UploadBulkEntity_parent_id` ON `${TABLE_NAME}` (`parent_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UploadBulkUriStringEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `upload_bulk_id` INTEGER NOT NULL, `uri` TEXT NOT NULL, `name` TEXT, `mime_type` TEXT, `size` INTEGER, `last_modified` INTEGER, FOREIGN KEY(`upload_bulk_id`) REFERENCES `UploadBulkEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uploadBulkId",
+            "columnName": "upload_bulk_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uri",
+            "columnName": "uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mime_type",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastModified",
+            "columnName": "last_modified",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "key"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UploadBulkUriStringEntity_upload_bulk_id",
+            "unique": false,
+            "columnNames": [
+              "upload_bulk_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UploadBulkUriStringEntity_upload_bulk_id` ON `${TABLE_NAME}` (`upload_bulk_id`)"
+          },
+          {
+            "name": "index_UploadBulkUriStringEntity_uri",
+            "unique": false,
+            "columnNames": [
+              "uri"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UploadBulkUriStringEntity_uri` ON `${TABLE_NAME}` (`uri`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "UploadBulkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "upload_bulk_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UploadTagEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`upload_link_id` INTEGER NOT NULL, `tag` INTEGER NOT NULL, PRIMARY KEY(`upload_link_id`, `tag`), FOREIGN KEY(`upload_link_id`) REFERENCES `LinkUploadEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "uploadLinkId",
+            "columnName": "upload_link_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "upload_link_id",
+            "tag"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "LinkUploadEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "upload_link_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "FolderMetadataEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `last_fetch_children_timestamp` INTEGER, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastFetchChildrenTimestamp",
+            "columnName": "last_fetch_children_timestamp",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TrashMetadataEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `last_fetch_trash_timestamp` INTEGER, PRIMARY KEY(`user_id`, `volume_id`), FOREIGN KEY(`user_id`, `volume_id`) REFERENCES `VolumeEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastFetchTrashTimestamp",
+            "columnName": "last_fetch_trash_timestamp",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "VolumeEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "RawBlockEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`upload_link_id` INTEGER NOT NULL, `index` INTEGER NOT NULL, `name` TEXT NOT NULL, PRIMARY KEY(`upload_link_id`, `index`), FOREIGN KEY(`upload_link_id`) REFERENCES `LinkUploadEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "uploadLinkId",
+            "columnName": "upload_link_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "index",
+            "columnName": "index",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "upload_link_id",
+            "index"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_RawBlockEntity_upload_link_id",
+            "unique": false,
+            "columnNames": [
+              "upload_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RawBlockEntity_upload_link_id` ON `${TABLE_NAME}` (`upload_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkUploadEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "upload_link_id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "BackupConfigurationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `network_type` TEXT NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `parent_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "networkType",
+            "columnName": "network_type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "parent_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "BackupDuplicateEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `hash` TEXT NOT NULL, `content_hash` TEXT, `link_id` TEXT, `state` TEXT, `revision_id` TEXT, `client_uid` TEXT, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "linkState",
+            "columnName": "state",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "revisionId",
+            "columnName": "revision_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "clientUid",
+            "columnName": "client_uid",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "BackupErrorEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `error` TEXT NOT NULL, `retryable` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `parent_id`, `error`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "error",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "retryable",
+            "columnName": "retryable",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "parent_id",
+            "error"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_BackupErrorEntity_user_id_share_id_parent_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BackupErrorEntity_user_id_share_id_parent_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `parent_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "BackupFileEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `bucket_id` INTEGER NOT NULL, `uri` TEXT NOT NULL, `mime_type` TEXT NOT NULL, `name` TEXT NOT NULL, `hash` TEXT NOT NULL, `size` INTEGER NOT NULL, `state` TEXT NOT NULL DEFAULT 'IDLE', `creation_time` INTEGER NOT NULL, `priority` INTEGER NOT NULL DEFAULT 9223372036854775807, `attempts` INTEGER NOT NULL DEFAULT 0, `last_modified` INTEGER, PRIMARY KEY(`user_id`, `share_id`, `parent_id`, `uri`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`, `bucket_id`) REFERENCES `BackupFolderEntity`(`user_id`, `share_id`, `parent_id`, `bucket_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bucketId",
+            "columnName": "bucket_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uriString",
+            "columnName": "uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mime_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'IDLE'"
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uploadPriority",
+            "columnName": "priority",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "9223372036854775807"
+          },
+          {
+            "fieldPath": "attempts",
+            "columnName": "attempts",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "lastModified",
+            "columnName": "last_modified",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "parent_id",
+            "uri"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_BackupFileEntity_user_id_share_id_parent_id_bucket_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "parent_id",
+              "bucket_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BackupFileEntity_user_id_share_id_parent_id_bucket_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `parent_id`, `bucket_id`)"
+          },
+          {
+            "name": "index_BackupFileEntity_user_id_share_id_parent_id_uri",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "parent_id",
+              "uri"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BackupFileEntity_user_id_share_id_parent_id_uri` ON `${TABLE_NAME}` (`user_id`, `share_id`, `parent_id`, `uri`)"
+          },
+          {
+            "name": "index_BackupFileEntity_user_id_share_id_parent_id_state",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "parent_id",
+              "state"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BackupFileEntity_user_id_share_id_parent_id_state` ON `${TABLE_NAME}` (`user_id`, `share_id`, `parent_id`, `state`)"
+          },
+          {
+            "name": "index_BackupFileEntity_user_id_share_id_parent_id_bucket_id_state",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "parent_id",
+              "bucket_id",
+              "state"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BackupFileEntity_user_id_share_id_parent_id_bucket_id_state` ON `${TABLE_NAME}` (`user_id`, `share_id`, `parent_id`, `bucket_id`, `state`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          },
+          {
+            "table": "BackupFolderEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id",
+              "bucket_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "parent_id",
+              "bucket_id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "BackupFolderEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `bucket_id` INTEGER NOT NULL, `update_time` INTEGER, `sync_time` INTEGER DEFAULT NULL, PRIMARY KEY(`user_id`, `share_id`, `parent_id`, `bucket_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `parent_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bucketId",
+            "columnName": "bucket_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "updateTime",
+            "columnName": "update_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "syncTime",
+            "columnName": "sync_time",
+            "affinity": "INTEGER",
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "parent_id",
+            "bucket_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "parent_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "InitialBackupEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `parent_id` TEXT NOT NULL, `creation_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `parent_id`))",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parent_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creationTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "parent_id"
+          ]
+        }
+      },
+      {
+        "tableName": "UploadStatsEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `count` INTEGER NOT NULL, `size` INTEGER NOT NULL, `creation_time` INTEGER NOT NULL, `capture_time` INTEGER, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "count",
+            "columnName": "count",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minimumUploadCreationDateTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minimumFileCreationDateTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DismissedQuotaEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `level` TEXT NOT NULL, `max_space` INTEGER NOT NULL, `update_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `level`, `max_space`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "level",
+            "columnName": "level",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "maxSpace",
+            "columnName": "max_space",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestampS",
+            "columnName": "update_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "level",
+            "max_space"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DismissedUserMessageEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `user_message` TEXT NOT NULL, `update_time` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `user_message`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userMessage",
+            "columnName": "user_message",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestampS",
+            "columnName": "update_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "user_message"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "NotificationChannelEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`user_id`, `type`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "type"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_NotificationChannelEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_NotificationChannelEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "NotificationEventEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `channel_type` TEXT NOT NULL, `notification_tag` TEXT NOT NULL, `notification_id` INTEGER NOT NULL, `notification_event_id` TEXT NOT NULL, `notification_event` TEXT NOT NULL, PRIMARY KEY(`user_id`, `channel_type`, `notification_tag`, `notification_id`, `notification_event_id`), FOREIGN KEY(`user_id`, `channel_type`) REFERENCES `NotificationChannelEntity`(`user_id`, `type`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "channelType",
+            "columnName": "channel_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationTag",
+            "columnName": "notification_tag",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationId",
+            "columnName": "notification_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationEventId",
+            "columnName": "notification_event_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationEvent",
+            "columnName": "notification_event",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "channel_type",
+            "notification_tag",
+            "notification_id",
+            "notification_event_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_NotificationEventEntity_user_id_channel_type_notification_tag_notification_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "channel_type",
+              "notification_tag",
+              "notification_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_NotificationEventEntity_user_id_channel_type_notification_tag_notification_id` ON `${TABLE_NAME}` (`user_id`, `channel_type`, `notification_tag`, `notification_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "NotificationChannelEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "channel_type"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "type"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TaglessNotificationEventEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `channel_type` TEXT NOT NULL, `notification_id` INTEGER NOT NULL, `notification_event_id` TEXT NOT NULL, `notification_event` TEXT NOT NULL, PRIMARY KEY(`user_id`, `channel_type`, `notification_id`, `notification_event_id`), FOREIGN KEY(`user_id`, `channel_type`) REFERENCES `NotificationChannelEntity`(`user_id`, `type`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "channelType",
+            "columnName": "channel_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationId",
+            "columnName": "notification_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationEventId",
+            "columnName": "notification_event_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationEvent",
+            "columnName": "notification_event",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "channel_type",
+            "notification_id",
+            "notification_event_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TaglessNotificationEventEntity_user_id_channel_type_notification_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "channel_type",
+              "notification_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaglessNotificationEventEntity_user_id_channel_type_notification_id` ON `${TABLE_NAME}` (`user_id`, `channel_type`, `notification_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "NotificationChannelEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "channel_type"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "type"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LinkSelectionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `selection_id` TEXT NOT NULL, PRIMARY KEY(`user_id`, `share_id`, `link_id`, `selection_id`), FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "selectionId",
+            "columnName": "selection_id",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id",
+            "selection_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_LinkSelectionEntity_user_id_share_id_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkSelectionEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          },
+          {
+            "name": "index_LinkSelectionEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkSelectionEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_LinkSelectionEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkSelectionEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_LinkSelectionEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkSelectionEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_LinkSelectionEntity_selection_id",
+            "unique": false,
+            "columnNames": [
+              "selection_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_LinkSelectionEntity_selection_id` ON `${TABLE_NAME}` (`selection_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "WorkerRunEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `user_id` TEXT NOT NULL, `worker_id` TEXT NOT NULL, `run_at` INTEGER NOT NULL, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "workerId",
+            "columnName": "worker_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "runAt",
+            "columnName": "run_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_WorkerRunEntity_worker_id",
+            "unique": false,
+            "columnNames": [
+              "worker_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_WorkerRunEntity_worker_id` ON `${TABLE_NAME}` (`worker_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PhotoListingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_PhotoListingEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_user_id_volume_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_user_id_volume_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_user_id_share_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_user_id_share_id_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_user_id_volume_id_capture_time_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "capture_time",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_user_id_volume_id_capture_time_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `capture_time`, `id`)"
+          },
+          {
+            "name": "index_PhotoListingEntity_user_id_volume_id_share_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_PhotoListingEntity_user_id_volume_id_share_id_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "RelatedPhotoEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `id` TEXT NOT NULL, `main_photo_link_id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `main_photo_link_id`) REFERENCES `PhotoListingEntity`(`user_id`, `volume_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mainPhotoLinkId",
+            "columnName": "main_photo_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_RelatedPhotoEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RelatedPhotoEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_RelatedPhotoEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RelatedPhotoEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_RelatedPhotoEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RelatedPhotoEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_RelatedPhotoEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RelatedPhotoEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_RelatedPhotoEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RelatedPhotoEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          },
+          {
+            "name": "index_RelatedPhotoEntity_user_id_volume_id_main_photo_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "main_photo_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_RelatedPhotoEntity_user_id_volume_id_main_photo_link_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `main_photo_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "PhotoListingEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "main_photo_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TaggedPhotoListingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `tag` INTEGER NOT NULL, `id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `tag`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "tag",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TaggedPhotoListingEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_user_id_volume_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_user_id_volume_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_user_id_share_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_user_id_share_id_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `id`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_user_id_volume_id_tag",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "tag"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_user_id_volume_id_tag` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `tag`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_user_id_volume_id_share_id_tag",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "tag"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_user_id_volume_id_share_id_tag` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `tag`)"
+          },
+          {
+            "name": "index_TaggedPhotoListingEntity_user_id_volume_id_id_tag_capture_time",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "id",
+              "tag",
+              "capture_time"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedPhotoListingEntity_user_id_volume_id_id_tag_capture_time` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `id`, `tag`, `capture_time`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TaggedRelatedPhotoEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `tag` INTEGER NOT NULL, `id` TEXT NOT NULL, `main_photo_link_id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `tag`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `tag`, `main_photo_link_id`) REFERENCES `TaggedPhotoListingEntity`(`user_id`, `volume_id`, `share_id`, `tag`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mainPhotoLinkId",
+            "columnName": "main_photo_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "tag",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TaggedRelatedPhotoEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedRelatedPhotoEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_TaggedRelatedPhotoEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedRelatedPhotoEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_TaggedRelatedPhotoEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedRelatedPhotoEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_TaggedRelatedPhotoEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedRelatedPhotoEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_TaggedRelatedPhotoEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedRelatedPhotoEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          },
+          {
+            "name": "index_TaggedRelatedPhotoEntity_user_id_volume_id_main_photo_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "main_photo_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TaggedRelatedPhotoEntity_user_id_volume_id_main_photo_link_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `main_photo_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "TaggedPhotoListingEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "tag",
+              "main_photo_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "tag",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "PhotoListingAnchorEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `key` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `next_key` TEXT, `is_complete` INTEGER NOT NULL, PRIMARY KEY(`key`, `volume_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nextKey",
+            "columnName": "next_key",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isComplete",
+            "columnName": "is_complete",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key",
+            "volume_id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AlbumRelatedPhotoEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `album_id` TEXT NOT NULL, `id` TEXT NOT NULL, `main_photo_link_id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `album_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `album_id`, `main_photo_link_id`) REFERENCES `AlbumPhotoListingEntity`(`user_id`, `volume_id`, `share_id`, `album_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "albumId",
+            "columnName": "album_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mainPhotoLinkId",
+            "columnName": "main_photo_link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "album_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AlbumRelatedPhotoEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumRelatedPhotoEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_AlbumRelatedPhotoEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumRelatedPhotoEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_AlbumRelatedPhotoEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumRelatedPhotoEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_AlbumRelatedPhotoEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumRelatedPhotoEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_AlbumRelatedPhotoEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumRelatedPhotoEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          },
+          {
+            "name": "index_AlbumRelatedPhotoEntity_user_id_volume_id_album_id_main_photo_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "album_id",
+              "main_photo_link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumRelatedPhotoEntity_user_id_volume_id_album_id_main_photo_link_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `album_id`, `main_photo_link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "AlbumPhotoListingEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "album_id",
+              "main_photo_link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "album_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AlbumPhotoListingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `album_id` TEXT NOT NULL, `id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `added_time` INTEGER NOT NULL, `is_child_of_album` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `album_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "albumId",
+            "columnName": "album_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "addedTime",
+            "columnName": "added_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isChildOfAlbum",
+            "columnName": "is_child_of_album",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "album_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AlbumPhotoListingEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingEntity_album_id",
+            "unique": false,
+            "columnNames": [
+              "album_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_album_id` ON `${TABLE_NAME}` (`album_id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingEntity_user_id_volume_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_user_id_volume_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingEntity_user_id_volume_id_share_id_album_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "album_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingEntity_user_id_volume_id_share_id_album_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `album_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AlbumListingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `id` TEXT NOT NULL, `locked` INTEGER NOT NULL, `count` INTEGER NOT NULL, `last_activity_time` INTEGER NOT NULL, `link_id` TEXT, `is_shared` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "albumId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locked",
+            "columnName": "locked",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "photoCount",
+            "columnName": "count",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastActivityTime",
+            "columnName": "last_activity_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "coverLinkId",
+            "columnName": "link_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isShared",
+            "columnName": "is_shared",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AlbumListingEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumListingEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_AlbumListingEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumListingEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_AlbumListingEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumListingEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_AlbumListingEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumListingEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_AlbumListingEntity_user_id_volume_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumListingEntity_user_id_volume_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`)"
+          },
+          {
+            "name": "index_AlbumListingEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumListingEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AlbumPhotoListingRemoteKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `key` TEXT NOT NULL, `user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `album_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `previous_key` TEXT, `next_key` TEXT, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `album_id`, `link_id`) REFERENCES `AlbumPhotoListingEntity`(`user_id`, `volume_id`, `share_id`, `album_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "albumId",
+            "columnName": "album_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "prevKey",
+            "columnName": "previous_key",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "nextKey",
+            "columnName": "next_key",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AlbumPhotoListingRemoteKeyEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingRemoteKeyEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingRemoteKeyEntity_key",
+            "unique": false,
+            "columnNames": [
+              "key"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AlbumPhotoListingRemoteKeyEntity_key` ON `${TABLE_NAME}` (`key`)"
+          },
+          {
+            "name": "index_AlbumPhotoListingRemoteKeyEntity_key_user_id_volume_id_share_id_album_id_link_id",
+            "unique": true,
+            "columnNames": [
+              "key",
+              "user_id",
+              "volume_id",
+              "share_id",
+              "album_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_AlbumPhotoListingRemoteKeyEntity_key_user_id_volume_id_share_id_album_id_link_id` ON `${TABLE_NAME}` (`key`, `user_id`, `volume_id`, `share_id`, `album_id`, `link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "AlbumPhotoListingEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "album_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "album_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "MediaStoreVersionEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `media_store_volume_name` TEXT NOT NULL, `version` TEXT, PRIMARY KEY(`user_id`, `media_store_volume_name`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeName",
+            "columnName": "media_store_volume_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "media_store_volume_name"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AddToAlbumEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `album_share_id` TEXT, `album_id` TEXT, `capture_time` INTEGER NOT NULL, `hash` TEXT, `content_hash` TEXT, PRIMARY KEY(`user_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `album_share_id`, `album_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "albumShareId",
+            "columnName": "album_share_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "albumId",
+            "columnName": "album_id",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contentHash",
+            "columnName": "content_hash",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AddToAlbumEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddToAlbumEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_AddToAlbumEntity_album_id",
+            "unique": false,
+            "columnNames": [
+              "album_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddToAlbumEntity_album_id` ON `${TABLE_NAME}` (`album_id`)"
+          },
+          {
+            "name": "index_AddToAlbumEntity_user_id_album_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "album_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddToAlbumEntity_user_id_album_id` ON `${TABLE_NAME}` (`user_id`, `album_id`)"
+          },
+          {
+            "name": "index_AddToAlbumEntity_user_id_album_share_id_album_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "album_share_id",
+              "album_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AddToAlbumEntity_user_id_album_share_id_album_id` ON `${TABLE_NAME}` (`user_id`, `album_share_id`, `album_id`)"
+          },
+          {
+            "name": "index_AddToAlbumEntity_user_id_share_id_link_id_album_share_id_album_id",
+            "unique": true,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id",
+              "album_share_id",
+              "album_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_AddToAlbumEntity_user_id_share_id_link_id_album_share_id_album_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`, `album_share_id`, `album_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "album_share_id",
+              "album_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TagsMigrationFileEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `id` TEXT NOT NULL, `capture_time` INTEGER NOT NULL, `state` TEXT NOT NULL, `uri` TEXT, `mime_type` TEXT, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`), FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "captureTime",
+            "columnName": "capture_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "state",
+            "columnName": "state",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uriString",
+            "columnName": "uri",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "mimeType",
+            "columnName": "mime_type",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TagsMigrationFileEntity_user_id_volume_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TagsMigrationFileEntity_user_id_volume_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`)"
+          },
+          {
+            "name": "index_TagsMigrationFileEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TagsMigrationFileEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_TagsMigrationFileEntity_user_id_share_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TagsMigrationFileEntity_user_id_share_id_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `id`)"
+          },
+          {
+            "name": "index_TagsMigrationFileEntity_user_id_volume_id_share_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TagsMigrationFileEntity_user_id_volume_id_share_id_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TagsMigrationFileTagEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `id` TEXT NOT NULL, `tag` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `id`, `tag`), FOREIGN KEY(`user_id`, `volume_id`, `share_id`, `id`) REFERENCES `TagsMigrationFileEntity`(`user_id`, `volume_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "id",
+            "tag"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TagsMigrationFileTagEntity_user_id_volume_id_share_id_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TagsMigrationFileTagEntity_user_id_volume_id_share_id_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "TagsMigrationFileEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DriveFeatureFlagRefreshEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `id` TEXT NOT NULL, `last_fetch_timestamp` INTEGER, PRIMARY KEY(`user_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastFetchTimestamp",
+            "columnName": "last_fetch_timestamp",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_DriveFeatureFlagRefreshEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DriveFeatureFlagRefreshEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "DeviceEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `id` TEXT NOT NULL, `type` INTEGER NOT NULL, `name` TEXT NOT NULL, `sync_state` INTEGER NOT NULL, `creation_time` INTEGER NOT NULL, `last_modified` INTEGER, `last_synced` INTEGER, PRIMARY KEY(`user_id`, `id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`) REFERENCES `ShareEntity`(`user_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`user_id`, `share_id`, `link_id`) REFERENCES `LinkEntity`(`user_id`, `share_id`, `id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "syncState",
+            "columnName": "sync_state",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "creationTime",
+            "columnName": "creation_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastModified",
+            "columnName": "last_modified",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastSynced",
+            "columnName": "last_synced",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_DeviceEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_DeviceEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_DeviceEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_DeviceEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_DeviceEntity_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_DeviceEntity_user_id_volume_id_share_id_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_user_id_volume_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`, `link_id`)"
+          },
+          {
+            "name": "index_DeviceEntity_user_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_user_id_share_id` ON `${TABLE_NAME}` (`user_id`, `share_id`)"
+          },
+          {
+            "name": "index_DeviceEntity_user_id_share_id_link_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DeviceEntity_user_id_share_id_link_id` ON `${TABLE_NAME}` (`user_id`, `share_id`, `link_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "ShareEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "id"
+            ]
+          },
+          {
+            "table": "LinkEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id",
+              "share_id",
+              "link_id"
+            ],
+            "referencedColumns": [
+              "user_id",
+              "share_id",
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "UrlLastFetchEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `url` TEXT NOT NULL, `last_fetch_timestamp` INTEGER, PRIMARY KEY(`user_id`, `url`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastFetchTimestamp",
+            "columnName": "last_fetch_timestamp",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "url"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_UrlLastFetchEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UrlLastFetchEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_UrlLastFetchEntity_url",
+            "unique": false,
+            "columnNames": [
+              "url"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_UrlLastFetchEntity_url` ON `${TABLE_NAME}` (`url`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SharedWithMeListingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, `type` INTEGER, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_SharedWithMeListingEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedWithMeListingEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_SharedWithMeListingEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedWithMeListingEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_SharedWithMeListingEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedWithMeListingEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_SharedWithMeListingEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedWithMeListingEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_SharedWithMeListingEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedWithMeListingEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SharedByMeListingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `volume_id` TEXT NOT NULL, `share_id` TEXT NOT NULL, `link_id` TEXT NOT NULL, PRIMARY KEY(`user_id`, `volume_id`, `share_id`, `link_id`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "volumeId",
+            "columnName": "volume_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shareId",
+            "columnName": "share_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "linkId",
+            "columnName": "link_id",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "volume_id",
+            "share_id",
+            "link_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_SharedByMeListingEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedByMeListingEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_SharedByMeListingEntity_volume_id",
+            "unique": false,
+            "columnNames": [
+              "volume_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedByMeListingEntity_volume_id` ON `${TABLE_NAME}` (`volume_id`)"
+          },
+          {
+            "name": "index_SharedByMeListingEntity_share_id",
+            "unique": false,
+            "columnNames": [
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedByMeListingEntity_share_id` ON `${TABLE_NAME}` (`share_id`)"
+          },
+          {
+            "name": "index_SharedByMeListingEntity_link_id",
+            "unique": false,
+            "columnNames": [
+              "link_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedByMeListingEntity_link_id` ON `${TABLE_NAME}` (`link_id`)"
+          },
+          {
+            "name": "index_SharedByMeListingEntity_user_id_volume_id_share_id",
+            "unique": false,
+            "columnNames": [
+              "user_id",
+              "volume_id",
+              "share_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SharedByMeListingEntity_user_id_volume_id_share_id` ON `${TABLE_NAME}` (`user_id`, `volume_id`, `share_id`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SharedRemoteKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `key` TEXT NOT NULL, `anchor_id` TEXT NOT NULL, `has_more` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "anchorId",
+            "columnName": "anchor_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasMore",
+            "columnName": "has_more",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "StalePublicAddressKeyEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `email` TEXT NOT NULL, `key` TEXT NOT NULL, PRIMARY KEY(`email`, `key`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`email`, `key`) REFERENCES `PublicAddressKeyDataEntity`(`email`, `publicKey`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "email",
+            "key"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_StalePublicAddressKeyEntity_email",
+            "unique": false,
+            "columnNames": [
+              "email"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_StalePublicAddressKeyEntity_email` ON `${TABLE_NAME}` (`email`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          },
+          {
+            "table": "PublicAddressKeyDataEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "email",
+              "key"
+            ],
+            "referencedColumns": [
+              "email",
+              "publicKey"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "CounterEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_id` TEXT NOT NULL, `key` TEXT NOT NULL, `count` INTEGER NOT NULL, `last_modified` INTEGER NOT NULL, PRIMARY KEY(`user_id`, `key`), FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "count",
+            "columnName": "count",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastModified",
+            "columnName": "last_modified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "user_id",
+            "key"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_CounterEntity_user_id",
+            "unique": false,
+            "columnNames": [
+              "user_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CounterEntity_user_id` ON `${TABLE_NAME}` (`user_id`)"
+          },
+          {
+            "name": "index_CounterEntity_key",
+            "unique": false,
+            "columnNames": [
+              "key"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CounterEntity_key` ON `${TABLE_NAME}` (`key`)"
+          },
+          {
+            "name": "index_CounterEntity_last_modified",
+            "unique": false,
+            "columnNames": [
+              "last_modified"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_CounterEntity_last_modified` ON `${TABLE_NAME}` (`last_modified`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ScanResultInfoEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `user_id` TEXT NOT NULL, `create_time` INTEGER NOT NULL, `name` TEXT NOT NULL, FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "user_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "create_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AccountEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "user_id"
+            ],
+            "referencedColumns": [
+              "userId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ScanResultDocumentEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `type` TEXT NOT NULL, `uri` TEXT NOT NULL, PRIMARY KEY(`type`, `uri`), FOREIGN KEY(`id`) REFERENCES `ScanResultInfoEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uriString",
+            "columnName": "uri",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "type",
+            "uri"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "ScanResultInfoEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ScanResultPageEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `type` TEXT NOT NULL, `uri` TEXT NOT NULL, `index` INTEGER NOT NULL, PRIMARY KEY(`type`, `uri`), FOREIGN KEY(`id`) REFERENCES `ScanResultInfoEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uriString",
+            "columnName": "uri",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pageNumber",
+            "columnName": "index",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "type",
+            "uri"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ScanResultPageEntity_id_index",
+            "unique": true,
+            "columnNames": [
+              "id",
+              "index"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ScanResultPageEntity_id_index` ON `${TABLE_NAME}` (`id`, `index`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "ScanResultInfoEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e8f1602d63b8e7d95e0831d437a719ab')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/drive/db/src/main/kotlin/me/proton/android/drive/db/DriveDatabase.kt b/drive/db/src/main/kotlin/me/proton/android/drive/db/DriveDatabase.kt
index fed036ad..f38215f1 100644
--- a/drive/db/src/main/kotlin/me/proton/android/drive/db/DriveDatabase.kt
+++ b/drive/db/src/main/kotlin/me/proton/android/drive/db/DriveDatabase.kt
@@ -75,8 +75,7 @@ import me.proton.core.drive.drivelink.paged.data.db.DriveLinkPagedDatabase
 import me.proton.core.drive.drivelink.paged.data.db.entity.DriveLinkRemoteKeyEntity
 import me.proton.core.drive.drivelink.photo.data.db.DriveLinkPhotoDatabase
 import me.proton.core.drive.drivelink.photo.data.db.entity.AlbumPhotoListingRemoteKeyEntity
-import me.proton.core.drive.drivelink.photo.data.db.entity.PhotoListingRemoteKeyEntity
-import me.proton.core.drive.drivelink.photo.data.db.entity.TaggedPhotoListingRemoteKeyEntity
+import me.proton.core.drive.drivelink.photo.data.db.entity.PhotoListingAnchorEntity
 import me.proton.core.drive.drivelink.selection.data.db.DriveLinkSelectionDatabase
 import me.proton.core.drive.drivelink.shared.data.db.DriveLinkSharedDatabase
 import me.proton.core.drive.drivelink.shared.data.db.entity.SharedRemoteKeyEntity
@@ -319,8 +318,7 @@ import me.proton.core.notification.data.local.db.NotificationDatabase as CoreNot
         RelatedPhotoEntity::class,
         TaggedPhotoListingEntity::class,
         TaggedRelatedPhotoEntity::class,
-        PhotoListingRemoteKeyEntity::class,
-        TaggedPhotoListingRemoteKeyEntity::class,
+        PhotoListingAnchorEntity::class,
         AlbumRelatedPhotoEntity::class,
         AlbumPhotoListingEntity::class,
         AlbumListingEntity::class,
@@ -447,7 +445,7 @@ abstract class DriveDatabase :
     DocumentScannerDatabase {
 
     companion object {
-        const val VERSION = 102
+        const val VERSION = 104
 
         private val migrations = listOf(
             DriveDatabaseMigrations.MIGRATION_1_2,
@@ -551,6 +549,8 @@ abstract class DriveDatabase :
             DriveDatabaseMigrations.MIGRATION_99_100,
             DriveDatabaseMigrations.MIGRATION_100_101,
             DriveDatabaseMigrations.MIGRATION_101_102,
+            DriveDatabaseMigrations.MIGRATION_102_103,
+            DriveDatabaseMigrations.MIGRATION_103_104,
         )
 
         fun buildDatabase(context: Context): DriveDatabase =
diff --git a/drive/db/src/main/kotlin/me/proton/android/drive/db/DriveDatabaseMigrations.kt b/drive/db/src/main/kotlin/me/proton/android/drive/db/DriveDatabaseMigrations.kt
index 82ba8e47..e4bb6892 100644
--- a/drive/db/src/main/kotlin/me/proton/android/drive/db/DriveDatabaseMigrations.kt
+++ b/drive/db/src/main/kotlin/me/proton/android/drive/db/DriveDatabaseMigrations.kt
@@ -662,4 +662,16 @@ object DriveDatabaseMigrations {
             DocumentScannerDatabase.MIGRATION_0.migrate(db)
         }
     }
+
+    val MIGRATION_102_103 = object : Migration(102, 103) {
+        override fun migrate(db: SupportSQLiteDatabase) {
+            LinkDatabase.MIGRATION_4.migrate(db)
+        }
+    }
+
+    val MIGRATION_103_104 = object : Migration(103, 104) {
+        override fun migrate(db: SupportSQLiteDatabase) {
+            DriveLinkPhotoDatabase.MIGRATION_4.migrate(db)
+        }
+    }
 }
diff --git a/drive/documentsprovider/data/src/main/kotlin/me/proton/core/drive/documentsprovider/data/DriveDocumentsProvider.kt b/drive/documentsprovider/data/src/main/kotlin/me/proton/core/drive/documentsprovider/data/DriveDocumentsProvider.kt
index ab06fd3b..e457cc66 100644
--- a/drive/documentsprovider/data/src/main/kotlin/me/proton/core/drive/documentsprovider/data/DriveDocumentsProvider.kt
+++ b/drive/documentsprovider/data/src/main/kotlin/me/proton/core/drive/documentsprovider/data/DriveDocumentsProvider.kt
@@ -164,7 +164,7 @@ class DriveDocumentsProvider : DocumentsProvider() {
         injections.withUploadFileLink(documentId.toDocumentId()) { _, uploadFileNode ->
             injections.cancelUploadFile(uploadFileNode).getOrNull()
         } ?: injections.withDriveLink(documentId.toDocumentId()) { userId, driveLink ->
-            injections.sendToTrash(userId, driveLink)
+            injections.sendToTrash(userId, driveLink).getOrThrow()
         }
     }
 
diff --git a/drive/documentsprovider/data/src/main/kotlin/me/proton/core/drive/documentsprovider/data/worker/ExportToDownloadWorker.kt b/drive/documentsprovider/data/src/main/kotlin/me/proton/core/drive/documentsprovider/data/worker/ExportToDownloadWorker.kt
index 4f065705..55f33665 100644
--- a/drive/documentsprovider/data/src/main/kotlin/me/proton/core/drive/documentsprovider/data/worker/ExportToDownloadWorker.kt
+++ b/drive/documentsprovider/data/src/main/kotlin/me/proton/core/drive/documentsprovider/data/worker/ExportToDownloadWorker.kt
@@ -32,7 +32,9 @@ import dagger.assisted.AssistedInject
 import kotlinx.coroutines.flow.firstOrNull
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.announce.event.domain.usecase.AnnounceEvent
+import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.data.workmanager.addTags
+import me.proton.core.drive.base.domain.log.LogTag.DOCUMENTS_PROVIDER
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.documentsprovider.data.extension.exportToMediaStoreDownloads
@@ -73,7 +75,9 @@ class ExportToDownloadWorker @AssistedInject constructor(
         uri.exportToMediaStoreDownloads(applicationContext.contentResolver, driveLink)
 
     override suspend fun handleResult(result: Result) {
-        deselectLinks(selectionId)
+        deselectLinks(selectionId).onFailure { error ->
+            error.log(DOCUMENTS_PROVIDER, "Failed to deselect links")
+        }
     }
 
     companion object {
diff --git a/drive/drivelink-crypto/data/src/main/kotlin/me/proton/core/drive/drivelink/crypto/data/usecase/IntegrityMetricsNotifierImpl.kt b/drive/drivelink-crypto/data/src/main/kotlin/me/proton/core/drive/drivelink/crypto/data/usecase/IntegrityMetricsNotifierImpl.kt
index 34880b99..ba5b3304 100644
--- a/drive/drivelink-crypto/data/src/main/kotlin/me/proton/core/drive/drivelink/crypto/data/usecase/IntegrityMetricsNotifierImpl.kt
+++ b/drive/drivelink-crypto/data/src/main/kotlin/me/proton/core/drive/drivelink/crypto/data/usecase/IntegrityMetricsNotifierImpl.kt
@@ -22,6 +22,7 @@ import me.proton.core.drive.base.domain.entity.Bytes
 import me.proton.core.drive.drivelink.crypto.domain.usecase.IntegrityMetricsNotifier
 import me.proton.core.drive.observability.data.extension.toStringBuckets
 import me.proton.core.drive.observability.domain.metrics.DownloadVerifierAttemptsTotal
+import me.proton.core.drive.observability.domain.metrics.common.BooleanStatus
 import me.proton.core.drive.observability.domain.usecase.EnqueueObservabilityEvent
 import javax.inject.Inject
 
@@ -32,6 +33,7 @@ class IntegrityMetricsNotifierImpl @Inject constructor(
     override suspend fun downloadVerifier(
         fileSize: Bytes,
         isSuccess: Boolean,
+        checksumVerified: Boolean,
         throwable: Throwable?
     ) {
         enqueueObservabilityEvent(
@@ -43,6 +45,7 @@ class IntegrityMetricsNotifierImpl @Inject constructor(
                         else -> DownloadVerifierAttemptsTotal.ResultStatusWithSkipped.failure
                     },
                     fileSize = fileSize.toStringBuckets(),
+                    checksumVerified = if (checksumVerified) BooleanStatus.`true` else BooleanStatus.`false`,
                 )
             )
         )
diff --git a/drive/drivelink-crypto/domain/src/main/kotlin/me/proton/core/drive/drivelink/crypto/domain/usecase/IntegrityMetricsNotifier.kt b/drive/drivelink-crypto/domain/src/main/kotlin/me/proton/core/drive/drivelink/crypto/domain/usecase/IntegrityMetricsNotifier.kt
index 30f40995..fb79ae16 100644
--- a/drive/drivelink-crypto/domain/src/main/kotlin/me/proton/core/drive/drivelink/crypto/domain/usecase/IntegrityMetricsNotifier.kt
+++ b/drive/drivelink-crypto/domain/src/main/kotlin/me/proton/core/drive/drivelink/crypto/domain/usecase/IntegrityMetricsNotifier.kt
@@ -25,6 +25,7 @@ interface IntegrityMetricsNotifier {
     suspend fun downloadVerifier(
         fileSize: Bytes,
         isSuccess: Boolean,
+        checksumVerified: Boolean,
         throwable: Throwable? = null,
     )
 }
diff --git a/drive/drivelink-download/data/build.gradle.kts b/drive/drivelink-download/data/build.gradle.kts
index 2e78eb81..b21bf3a5 100644
--- a/drive/drivelink-download/data/build.gradle.kts
+++ b/drive/drivelink-download/data/build.gradle.kts
@@ -47,6 +47,7 @@ driveModule(
     implementation(libs.androidx.lifecycle.livedata.ktx)
     implementation(libs.core.crypto)
     implementation(libs.core.network)
+    implementation(libs.core.presentation)
 
     testImplementation(testFixtures(project(":drive:files:presentation")))
 }
diff --git a/drive/drivelink-download/data/src/main/kotlin/me/proton/core/drive/drivelink/download/data/manager/DownloadManagerImpl.kt b/drive/drivelink-download/data/src/main/kotlin/me/proton/core/drive/drivelink/download/data/manager/DownloadManagerImpl.kt
index 5945972c..2fec4823 100644
--- a/drive/drivelink-download/data/src/main/kotlin/me/proton/core/drive/drivelink/download/data/manager/DownloadManagerImpl.kt
+++ b/drive/drivelink-download/data/src/main/kotlin/me/proton/core/drive/drivelink/download/data/manager/DownloadManagerImpl.kt
@@ -53,6 +53,7 @@ import me.proton.core.drive.drivelink.domain.entity.DriveLink
 import me.proton.core.drive.drivelink.domain.usecase.GetDriveLink
 import me.proton.core.drive.drivelink.download.data.extension.observeNetworkTypes
 import me.proton.core.drive.drivelink.download.data.manager.DownloadManagerImpl.DownloadFileTask
+import me.proton.core.drive.drivelink.download.data.worker.DownloadEventWorker
 import me.proton.core.drive.drivelink.download.data.worker.FileDownloaderWorker
 import me.proton.core.drive.drivelink.download.domain.entity.DownloadFileLink
 import me.proton.core.drive.drivelink.download.domain.entity.DownloadParentLink
@@ -186,12 +187,12 @@ class DownloadManagerImpl @Inject constructor(
         downloadParentLinkRepository.deleteAll(userId)
     }
 
-    override fun getProgressFlow(driveLink: DriveLink.File): Flow<Percentage>? =
+    override fun getProgressFlow(fileId: FileId): Flow<Percentage>? =
         runningTasks
-            .takeIf { runningTasks -> runningTasks.value.firstOrNull(driveLink.id) != null }
+            .takeIf { runningTasks -> runningTasks.value.firstOrNull(fileId) != null }
             ?.transform { runningTasks ->
                 runningTasks
-                    .firstOrNull(driveLink.id)
+                    .firstOrNull(fileId)
                     ?.let { task -> emitAll(task.progress) }
             }
 
@@ -209,6 +210,7 @@ class DownloadManagerImpl @Inject constructor(
                     pipelineId = pipelineId,
                     downloadFileLink = downloadFileLink,
                     progress = MutableStateFlow(Percentage(0)),
+                    setDownloadState = setDownloadState,
                     downloadFile = downloadFile,
                 ).also { task ->
                     runningTasks.value += task
@@ -249,6 +251,7 @@ class DownloadManagerImpl @Inject constructor(
 
     private suspend fun taskCompleteSuccessfully(task: DownloadFileTask) {
         CoreLogger.d(task.downloadFileLink.fileId.logTag, "taskCompleted pipelineId=${task.pipelineId}")
+        setDownloadState(task.downloadFileLink.fileId, DownloadState.Ready)
         downloadSdkManager.close(
             volumeId = task.downloadFileLink.volumeId,
             fileId = task.downloadFileLink.fileId,
@@ -261,6 +264,7 @@ class DownloadManagerImpl @Inject constructor(
 
     private suspend fun taskCompletedWithException(task: DownloadFileTask, throwable: Throwable) {
         throwable.log(task.downloadFileLink.fileId.logTag, "taskCompleted pipelineId=${task.pipelineId}")
+        setDownloadState(task.downloadFileLink.fileId, DownloadState.Error)
         downloadErrorManager.post(task.downloadFileLink.fileId, throwable)
         downloadMetricsNotifier(task.downloadFileLink.fileId, false, throwable)
         runningTasks.value -= task
@@ -304,6 +308,7 @@ class DownloadManagerImpl @Inject constructor(
             )
     }.also {
         startFileDownloaderWorker(userId)
+        startDownloadEventWorker(userId)
     }
 
     private suspend fun downloadFile(
@@ -653,6 +658,14 @@ class DownloadManagerImpl @Inject constructor(
         ).await()
     }
 
+    private suspend fun startDownloadEventWorker(userId: UserId) {
+        workManager.enqueueUniqueWork(
+            DownloadEventWorker.UNIQUE_WORK_NAME,
+            ExistingWorkPolicy.KEEP,
+            DownloadEventWorker.getWorkRequest(userId)
+        ).await()
+    }
+
     private fun observeIdleFiles(userId: UserId, coroutineContext: CoroutineContext) {
         downloadFileRepository
             .getCountFlow(userId, DownloadFileLink.State.IDLE)
@@ -755,9 +768,12 @@ class DownloadManagerImpl @Inject constructor(
         val pipelineId: Long,
         val downloadFileLink: DownloadFileLink,
         val progress: MutableStateFlow<Percentage>,
+        val setDownloadState: SetDownloadState,
         val downloadFile: DownloadFile,
     ) : PipelineManager.Task {
         override suspend fun invoke(isCancelled: () -> Boolean) {
+            setDownloadState(downloadFileLink.fileId, DownloadState.Downloading)
+
             downloadFile(
                 volumeId = downloadFileLink.volumeId,
                 fileId = downloadFileLink.fileId,
diff --git a/drive/drivelink-download/data/src/main/kotlin/me/proton/core/drive/drivelink/download/data/worker/DownloadEventWorker.kt b/drive/drivelink-download/data/src/main/kotlin/me/proton/core/drive/drivelink/download/data/worker/DownloadEventWorker.kt
new file mode 100644
index 00000000..520da75f
--- /dev/null
+++ b/drive/drivelink-download/data/src/main/kotlin/me/proton/core/drive/drivelink/download/data/worker/DownloadEventWorker.kt
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.drivelink.download.data.worker
+
+import android.app.Notification
+import android.content.Context
+import android.content.pm.ServiceInfo
+import androidx.hilt.work.HiltWorker
+import androidx.work.CoroutineWorker
+import androidx.work.Data
+import androidx.work.ForegroundInfo
+import androidx.work.OneTimeWorkRequest
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.sample
+import kotlinx.coroutines.flow.takeWhile
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.supervisorScope
+import kotlinx.coroutines.withContext
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.announce.event.domain.entity.Event
+import me.proton.core.drive.announce.event.domain.usecase.AnnounceEvent
+import me.proton.core.drive.base.domain.entity.Percentage
+import me.proton.core.drive.base.domain.extension.getOrNull
+import me.proton.core.drive.base.domain.log.LogTag
+import me.proton.core.drive.drivelink.download.domain.entity.DownloadFileLink
+import me.proton.core.drive.drivelink.download.domain.manager.DownloadManager
+import me.proton.core.drive.drivelink.download.domain.repository.DownloadFileRepository
+import me.proton.core.drive.feature.flag.domain.entity.FeatureFlagId.Companion.driveAndroidDownloadFileProgressNotificationDisabled
+import me.proton.core.drive.feature.flag.domain.extension.on
+import me.proton.core.drive.feature.flag.domain.usecase.GetFeatureFlag
+import me.proton.core.drive.notification.domain.entity.NotificationId
+import me.proton.core.drive.worker.data.usecase.TransferDataNotifier
+import me.proton.core.presentation.app.AppLifecycleProvider
+import me.proton.core.util.kotlin.CoreLogger
+import kotlin.time.Duration.Companion.seconds
+
+@HiltWorker
+@OptIn(ExperimentalCoroutinesApi::class, FlowPreview::class)
+class DownloadEventWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted workerParams: WorkerParameters,
+    private val downloadFileRepository: DownloadFileRepository,
+    private val downloadManager: DownloadManager,
+    private val announceEvent: AnnounceEvent,
+    private val transferDataNotifier: TransferDataNotifier,
+    private val appLifecycleProvider: AppLifecycleProvider,
+    private val getFeatureFlag: GetFeatureFlag,
+) : CoroutineWorker(appContext, workerParams) {
+
+    private val userId =
+        UserId(requireNotNull(inputData.getString(WorkerKeys.KEY_USER_ID)) { "User id is required" })
+
+    private val transferDataNotification: kotlin.Result<Pair<NotificationId, Notification>> =
+        transferDataNotifier(userId = userId, event = Event.TransferData)
+
+    override suspend fun doWork(): Result {
+        val isKillSwitchOn = getFeatureFlag(
+            driveAndroidDownloadFileProgressNotificationDisabled(userId)
+        ).on
+        if (isKillSwitchOn) {
+            CoreLogger.d(LogTag.NOTIFICATION, "Kill switch is on, skipping download event worker")
+            return Result.success()
+        }
+        if (appLifecycleProvider.state.value != AppLifecycleProvider.State.Foreground) {
+            CoreLogger.d(LogTag.NOTIFICATION, "App is not in foreground, skipping download event worker")
+            return Result.success()
+        }
+        CoreLogger.d(LogTag.NOTIFICATION, "Starting download event worker")
+        setForeground()
+        try {
+            supervisorScope {
+                val progressMap = MutableStateFlow<Map<Long, Percentage>>(emptyMap())
+                val previousLinks = mutableMapOf<Long, DownloadFileLink>()
+                val fileProgressJobs = mutableMapOf<Long, Job>()
+
+                val progressMapJob = progressMap
+                    .sample(1.seconds)
+                    .onEach { map ->
+                        val count = map.size
+                        val aggregate = if (count > 0) {
+                            Percentage(map.values.sumOf { it.value.toDouble() }.toFloat() / count)
+                        } else {
+                            Percentage(0f)
+                        }
+                        announceEvent(
+                            userId = userId,
+                            event = Event.DownloadFileProgress(
+                                downloadingCount = count,
+                                progress = aggregate,
+                            ),
+                        )
+                    }
+                    .launchIn(this)
+
+                combine(
+                    downloadFileRepository.getCountFlow(userId, DownloadFileLink.State.RUNNING),
+                    downloadFileRepository.getCountFlow(userId, DownloadFileLink.State.IDLE),
+                ) { running, idle -> running + idle }
+                    .takeWhile { total -> total > 0 }
+                    .onEach {
+                        val running = downloadFileRepository.getAllWithState(userId, DownloadFileLink.State.RUNNING)
+                        val currentIds = running.map { it.id }.toSet()
+                        (previousLinks.keys - currentIds).forEach { id ->
+                            fileProgressJobs.remove(id)?.cancel()
+                            progressMap.update { it - id }
+                        }
+                        (currentIds - previousLinks.keys).forEach { id ->
+                            val link = running.first { it.id == id }
+                            fileProgressJobs[id] = async {
+                                downloadManager.getProgressFlow(link.fileId)
+                                    ?.collect { percentage ->
+                                        progressMap.update { it + (id to percentage) }
+                                    }
+                            }
+                        }
+                        previousLinks.clear()
+                        previousLinks.putAll(running.associateBy { it.id })
+                    }
+                    .onCompletion {
+                        CoreLogger.d(LogTag.NOTIFICATION, "Stop observing download file links")
+                        fileProgressJobs.values.forEach { it.cancel() }
+                        progressMapJob.cancel()
+                    }
+                    .launchIn(this)
+            }
+        } catch (e: CancellationException) {
+            CoreLogger.d(LogTag.NOTIFICATION, e, e.message.orEmpty())
+            throw e
+        } finally {
+            withContext(NonCancellable) {
+                announceEvent(
+                    userId = userId,
+                    event = Event.DownloadFileProgress(
+                        downloadingCount = 0,
+                        progress = Percentage(0f),
+                    ),
+                )
+            }
+            transferDataNotification.getOrNull(LogTag.NOTIFICATION)
+                ?.first
+                ?.let { notificationId -> transferDataNotifier.dismissNotification(notificationId) }
+        }
+        CoreLogger.d(LogTag.NOTIFICATION, "Download event worker finished")
+        return Result.success()
+    }
+
+    override suspend fun getForegroundInfo(): ForegroundInfo =
+        createForegroundInfo().getOrThrow()
+
+    private fun createForegroundInfo(): kotlin.Result<ForegroundInfo> = runCatching {
+        val (notificationId, notification) = transferDataNotification.getOrThrow()
+        ForegroundInfo(
+            notificationId.id,
+            notification,
+            ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC,
+        )
+    }
+
+    private suspend fun setForeground() {
+        createForegroundInfo()
+            .getOrNull(LogTag.NOTIFICATION, "Failed creating foreground info")
+            ?.let { foregroundInfo -> setForeground(foregroundInfo) }
+    }
+
+    companion object {
+        const val UNIQUE_WORK_NAME = "DownloadEventWorker"
+
+        fun getWorkRequest(userId: UserId): OneTimeWorkRequest =
+            OneTimeWorkRequest.Builder(DownloadEventWorker::class.java)
+                .setInputData(
+                    Data.Builder()
+                        .putString(WorkerKeys.KEY_USER_ID, userId.id)
+                        .build()
+                )
+                .build()
+    }
+}
diff --git a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/manager/DownloadManager.kt b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/manager/DownloadManager.kt
index 459db4aa..0549c3ea 100644
--- a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/manager/DownloadManager.kt
+++ b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/manager/DownloadManager.kt
@@ -23,6 +23,7 @@ import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.base.domain.entity.Percentage
 import me.proton.core.drive.drivelink.domain.entity.DriveLink
 import me.proton.core.drive.drivelink.download.domain.entity.NetworkType
+import me.proton.core.drive.link.domain.entity.FileId
 import kotlin.coroutines.CoroutineContext
 
 interface DownloadManager {
@@ -34,7 +35,7 @@ interface DownloadManager {
     )
     suspend fun cancel(driveLink: DriveLink)
     suspend fun cancelAll(userId: UserId)
-    fun getProgressFlow(driveLink: DriveLink.File): Flow<Percentage>?
+    fun getProgressFlow(fileId: FileId): Flow<Percentage>?
 
     interface FileDownloader {
         suspend fun start(userId: UserId, coroutineContext: CoroutineContext): Result<Unit>
diff --git a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/manager/DownloadSdkManager.kt b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/manager/DownloadSdkManager.kt
index e679476e..0b8d1062 100644
--- a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/manager/DownloadSdkManager.kt
+++ b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/manager/DownloadSdkManager.kt
@@ -26,6 +26,7 @@ import me.proton.core.drive.base.domain.log.logId
 import me.proton.core.drive.base.domain.provider.ProtonDriveClientProvider
 import me.proton.core.drive.base.domain.provider.ProtonPhotosClientProvider
 import me.proton.core.drive.link.domain.entity.FileId
+import me.proton.core.drive.link.domain.extension.revisionUid
 import me.proton.core.drive.link.domain.extension.userId
 import me.proton.core.drive.volume.domain.entity.VolumeId
 import me.proton.core.util.kotlin.CoreLogger
@@ -33,7 +34,7 @@ import me.proton.drive.sdk.DownloadController
 import me.proton.drive.sdk.Downloader
 import me.proton.drive.sdk.ProtonDriveClient
 import me.proton.drive.sdk.ProtonPhotosClient
-import me.proton.drive.sdk.Uid
+import me.proton.drive.sdk.entity.RevisionUid
 import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -50,7 +51,7 @@ class DownloadSdkManager @Inject constructor(
         var controller: DownloadController? = null
     )
 
-    private val states = ConcurrentHashMap<String, DownloadState>()
+    private val states = ConcurrentHashMap<RevisionUid, DownloadState>()
 
     suspend fun enqueueFile(
         volumeId: VolumeId,
@@ -58,10 +59,9 @@ class DownloadSdkManager @Inject constructor(
         revisionId: String,
         block: suspend (ProtonDriveClient) -> Downloader
     ) {
-        val nodeRevisionUid = Uid.makeNodeRevisionUid(
-            volumeId = volumeId.id,
-            nodeId = fileId.id,
-            revisionId = revisionId
+        val nodeRevisionUid = fileId.revisionUid(
+            volumeId = volumeId,
+            revisionId = revisionId,
         )
         with(nodeRevisionUid.state()) {
             mutex.withLock {
@@ -82,10 +82,9 @@ class DownloadSdkManager @Inject constructor(
         revisionId: String,
         block: suspend (ProtonPhotosClient) -> Downloader
     ) {
-        val nodeRevisionUid = Uid.makeNodeRevisionUid(
-            volumeId = volumeId.id,
-            nodeId = fileId.id,
-            revisionId = revisionId
+        val nodeRevisionUid = fileId.revisionUid(
+            volumeId = volumeId,
+            revisionId = revisionId,
         )
         with(nodeRevisionUid.state()) {
             mutex.withLock {
@@ -106,10 +105,9 @@ class DownloadSdkManager @Inject constructor(
         revisionId: String,
         block: suspend (Downloader) -> DownloadController
     ): DownloadController {
-        val nodeRevisionUid = Uid.makeNodeRevisionUid(
-            volumeId = volumeId.id,
-            nodeId = fileId.id,
-            revisionId = revisionId
+        val nodeRevisionUid = fileId.revisionUid(
+            volumeId = volumeId,
+            revisionId = revisionId,
         )
         return with(nodeRevisionUid.state()) {
             mutex.withLock {
@@ -126,10 +124,9 @@ class DownloadSdkManager @Inject constructor(
         fileId: FileId,
         revisionId: String,
     ) {
-        val nodeRevisionUid = Uid.makeNodeRevisionUid(
-            volumeId = volumeId.id,
-            nodeId = fileId.id,
-            revisionId = revisionId
+        val nodeRevisionUid = fileId.revisionUid(
+            volumeId = volumeId,
+            revisionId = revisionId,
         )
         val state = states.remove(nodeRevisionUid) ?: return
         with(state) {
@@ -151,10 +148,9 @@ class DownloadSdkManager @Inject constructor(
         fileId: FileId,
         revisionId: String,
     ) {
-        val nodeRevisionUid = Uid.makeNodeRevisionUid(
-            volumeId = volumeId.id,
-            nodeId = fileId.id,
-            revisionId = revisionId
+        val nodeRevisionUid = fileId.revisionUid(
+            volumeId = volumeId,
+            revisionId = revisionId,
         )
         val state = states.remove(nodeRevisionUid) ?: return
         with(state) {
@@ -176,7 +172,7 @@ class DownloadSdkManager @Inject constructor(
         }
     }
 
-    private fun String.state(): DownloadState =
+    private fun RevisionUid.state(): DownloadState =
         states.computeIfAbsent(this) {
             DownloadState(mutex = Mutex())
         }
diff --git a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/Download.kt b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/Download.kt
index db291a0d..cdb86b65 100644
--- a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/Download.kt
+++ b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/Download.kt
@@ -18,6 +18,7 @@
 package me.proton.core.drive.drivelink.download.domain.usecase
 
 import me.proton.core.drive.base.domain.extension.toResult
+import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.drivelink.domain.entity.DriveLink
 import me.proton.core.drive.drivelink.domain.usecase.GetDriveLink
 import me.proton.core.drive.drivelink.download.domain.entity.DownloadFileLink
@@ -35,23 +36,25 @@ class Download @Inject constructor(
         linkId: LinkId,
         retryable: Boolean = true,
         networkType: NetworkType = NetworkType.ANY,
-    ) =
+    ) = coRunCatching {
         getDriveLink(linkId).toResult().getOrThrow().let { driveLink ->
-            invoke(driveLink, retryable, networkType)
+            invoke(driveLink, retryable, networkType).getOrThrow()
         }
+    }
 
     suspend operator fun invoke(
         driveLink: DriveLink,
         retryable: Boolean = true,
         networkType: NetworkType = NetworkType.ANY,
-    ) =
-        invoke(listOf(driveLink), retryable, networkType)
+    ) = coRunCatching {
+        invoke(listOf(driveLink), retryable, networkType).getOrThrow()
+    }
 
     suspend operator fun invoke(
         driveLinks: List<DriveLink>,
         retryable: Boolean = true,
         networkType: NetworkType = NetworkType.ANY,
-    ) =
+    ) = coRunCatching {
         driveLinks.forEach { driveLink ->
             val priority = if (retryable) {
                 DownloadFileLink.AVAILABLE_OFFLINE_PRIORITY
@@ -60,4 +63,5 @@ class Download @Inject constructor(
             }
             downloadManager.download(driveLink, priority, retryable, networkType)
         }
+    }
 }
diff --git a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/DownloadFileLegacy.kt b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/DownloadFileLegacy.kt
index 65113a47..fd846899 100644
--- a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/DownloadFileLegacy.kt
+++ b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/DownloadFileLegacy.kt
@@ -35,6 +35,7 @@ import me.proton.core.drive.base.domain.extension.bytes
 import me.proton.core.drive.base.domain.extension.getOrNull
 import me.proton.core.drive.base.domain.extension.mapWithPrevious
 import me.proton.core.drive.base.domain.extension.toResult
+import me.proton.core.drive.base.domain.formatter.DateTimeFormatter
 import me.proton.core.drive.base.domain.log.LogTag
 import me.proton.core.drive.base.domain.log.logId
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
@@ -45,13 +46,13 @@ import me.proton.core.drive.drivelink.crypto.domain.usecase.IntegrityMetricsNoti
 import me.proton.core.drive.drivelink.domain.usecase.GetDriveLink
 import me.proton.core.drive.drivelink.download.domain.exception.InvalidBlocksException
 import me.proton.core.drive.file.base.domain.entity.Block
+import me.proton.core.drive.file.base.domain.extension.captureTime
 import me.proton.core.drive.file.base.domain.extension.verifyOrDelete
 import me.proton.core.drive.file.base.domain.usecase.GetBlockFile
+import me.proton.core.drive.file.base.domain.usecase.GetRevision
 import me.proton.core.drive.link.domain.entity.FileId
 import me.proton.core.drive.link.domain.extension.userId
-import me.proton.core.drive.linkdownload.domain.entity.DownloadState
 import me.proton.core.drive.linkdownload.domain.usecase.RemoveSignatureVerificationFailed
-import me.proton.core.drive.linkdownload.domain.usecase.SetDownloadState
 import me.proton.core.drive.linkdownload.domain.usecase.SetSignatureVerificationFailed
 import me.proton.core.drive.thumbnail.domain.usecase.GetThumbnailPermanentFile
 import me.proton.core.drive.volume.domain.entity.VolumeId
@@ -59,12 +60,11 @@ import me.proton.core.util.kotlin.CoreLogger
 import javax.inject.Inject
 
 class DownloadFileLegacy @Inject constructor(
-    private val setDownloadingAndGetRevision: SetDownloadingAndGetRevision,
+    private val getRevision: GetRevision,
     private val getBlockFile: GetBlockFile,
     private val downloadBlock: DownloadBlock,
     private val verifyDownloadedBlocks: VerifyDownloadedBlocks,
     private val configurationProvider: ConfigurationProvider,
-    private val setDownloadState: SetDownloadState,
     private val getThumbnailPermanentFile: GetThumbnailPermanentFile,
     private val moveFileIfExists: MoveFileIfExists,
     private val getDriveLink: GetDriveLink,
@@ -75,6 +75,7 @@ class DownloadFileLegacy @Inject constructor(
     private val verifyDownloadedFile: VerifyDownloadedFile,
     private val integrityMetricsNotifier: IntegrityMetricsNotifier,
     private val reportError: ReportError,
+    private val dateTimeFormatter: DateTimeFormatter,
 ) {
 
     suspend operator fun invoke(
@@ -85,12 +86,11 @@ class DownloadFileLegacy @Inject constructor(
         progress: MutableStateFlow<Percentage>,
     ) = coRunCatching {
         val driveLink = getDriveLink(fileId).toResult().getOrThrow()
-        val revision = setDownloadingAndGetRevision(fileId, revisionId).getOrThrow()
+        val revision = getRevision(fileId, revisionId).getOrThrow()
         getThumbnailPermanentFile(volumeId, driveLink.link, revisionId).getOrThrow()
         val file = moveFileIfExists(fileId).getOrThrow()
         if (file.exists()) {
             CoreLogger.d(LogTag.DOWNLOAD, "File already downloaded")
-            setDownloadState(driveLink.link, DownloadState.Ready)
             return@coRunCatching
         }
         coroutineScope {
@@ -166,31 +166,46 @@ class DownloadFileLegacy @Inject constructor(
                 )
             }.getOrThrow()
         if (verifyDownloadedFile.isAllowed(userId = driveLink.userId)) {
+            val checksumVerified = driveLink.link.activeRevisionChecksumVerified
             verifyDownloadedFile(
                 driveLink = driveLink,
-                revisionId = revisionId,
                 file = downloadedFile,
             )
                 .onSuccess {
                     integrityMetricsNotifier.downloadVerifier(
                         fileSize = downloadedFile.length().bytes,
                         isSuccess = true,
+                        checksumVerified = checksumVerified,
                     )
                 }
                 .recoverCatching { error ->
                     if (error is ContentDigestVerifierException.Mismatch) {
                         val fileSize = downloadedFile.length().bytes
-                        downloadedFile.delete()
                         integrityMetricsNotifier.downloadVerifier(
                             fileSize = fileSize,
                             isSuccess = false,
+                            checksumVerified = checksumVerified,
                             throwable = error,
                         )
-                        throw error
+                        if (checksumVerified) {
+                            downloadedFile.delete()
+                            throw error
+                        } else {
+                            reportError(
+                                tag = LogTag.DOWNLOAD,
+                                error = error,
+                                message = buildString {
+                                    append("ContentDigestVerifierException.Mismatch ChecksumVerified=false, ")
+                                    append("revisionId=${revisionId}, ")
+                                    append("creationTime=${driveLink.link.creationTime.captureTime(dateTimeFormatter)}")
+                                },
+                            )
+                        }
                     } else {
                         integrityMetricsNotifier.downloadVerifier(
                             fileSize = downloadedFile.length().bytes,
                             isSuccess = true,
+                            checksumVerified = checksumVerified,
                             throwable = error,
                         )
                     }
@@ -199,9 +214,6 @@ class DownloadFileLegacy @Inject constructor(
         }
     }.onFailure { error ->
         reportError(LogTag.DOWNLOAD, error, "Cannot download file ${fileId.id} (legacy)")
-        setDownloadState(fileId, DownloadState.Error)
-    }.onSuccess {
-        setDownloadState(fileId, DownloadState.Ready)
     }
 
     private suspend fun List<Block>.blocksForDownload(
diff --git a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/DownloadFileSdk.kt b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/DownloadFileSdk.kt
index 9ad75e79..6196f2e2 100644
--- a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/DownloadFileSdk.kt
+++ b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/DownloadFileSdk.kt
@@ -30,6 +30,8 @@ import me.proton.core.drive.base.domain.extension.bytes
 import me.proton.core.drive.base.domain.extension.getOrNull
 import me.proton.core.drive.base.domain.extension.toPercentage
 import me.proton.core.drive.base.domain.extension.toResult
+import me.proton.core.drive.base.domain.formatter.DateTimeFormatter
+import me.proton.core.drive.base.domain.log.LogTag
 import me.proton.core.drive.base.domain.log.LogTag.DOWNLOAD
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.GetDownloadStagingTempFolder
@@ -40,7 +42,10 @@ import me.proton.core.drive.drivelink.domain.extension.decryptedFileName
 import me.proton.core.drive.drivelink.domain.usecase.GetDriveLink
 import me.proton.core.drive.drivelink.domain.usecase.GetVolumeType
 import me.proton.core.drive.drivelink.download.domain.manager.DownloadSdkManager
+import me.proton.core.drive.file.base.domain.extension.captureTime
 import me.proton.core.drive.link.domain.entity.FileId
+import me.proton.core.drive.link.domain.extension.nodeUid
+import me.proton.core.drive.link.domain.extension.revisionUid
 import me.proton.core.drive.link.domain.extension.userId
 import me.proton.core.drive.linkdownload.domain.entity.DownloadState
 import me.proton.core.drive.linkdownload.domain.usecase.RemoveSignatureVerificationFailed
@@ -54,8 +59,6 @@ import me.proton.drive.sdk.DownloadController
 import me.proton.drive.sdk.ProtonDriveSdkException
 import me.proton.drive.sdk.ProtonSdkError
 import me.proton.drive.sdk.ProtonSdkError.ErrorDomain
-import me.proton.drive.sdk.Uid
-import me.proton.drive.sdk.downloader
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
@@ -75,6 +78,7 @@ class DownloadFileSdk @Inject constructor(
     private val integrityMetricsNotifier: IntegrityMetricsNotifier,
     private val configurationProvider: ConfigurationProvider,
     private val reportError: ReportError,
+    private val dateTimeFormatter: DateTimeFormatter,
 ) {
 
     suspend operator fun invoke(
@@ -86,14 +90,12 @@ class DownloadFileSdk @Inject constructor(
         var file: File?
         var tmpFile: File?
         return coRunCatching {
-            setDownloadState(fileId, DownloadState.Downloading)
             file = moveFileIfExists(fileId).getOrThrow()
             val driveLink = getDriveLink(fileId).toResult().getOrThrow()
             val volumeType = getVolumeType(driveLink).getOrThrow()
             getThumbnailPermanentFile(volumeId, driveLink.link, revisionId).getOrThrow()
             if (file.exists()) {
                 CoreLogger.d(DOWNLOAD, "File already downloaded")
-                setDownloadState(driveLink.link, DownloadState.Ready)
                 return@coRunCatching
             }
 
@@ -113,10 +115,7 @@ class DownloadFileSdk @Inject constructor(
                             revisionId = revisionId,
                         ) { client ->
                             client.downloader(
-                                photoUid = Uid.makeNodeUid(
-                                    volumeId = driveLink.volumeId.id,
-                                    nodeId = fileId.id,
-                                ),
+                                photoUid = fileId.nodeUid(driveLink.volumeId),
                                 timeout = configurationProvider.sdkQueueTimeout,
                             )
                         }
@@ -129,9 +128,8 @@ class DownloadFileSdk @Inject constructor(
                             revisionId = revisionId,
                         ) { client ->
                             client.downloader(
-                                revisionUid = Uid.makeNodeRevisionUid(
-                                    volumeId = volumeId.id,
-                                    nodeId = fileId.id,
+                                revisionUid = fileId.revisionUid(
+                                    volumeId = volumeId,
                                     revisionId = revisionId,
                                 ),
                                 timeout = configurationProvider.sdkQueueTimeout,
@@ -190,45 +188,58 @@ class DownloadFileSdk @Inject constructor(
                 StandardCopyOption.REPLACE_EXISTING
             )
             if (verifyDownloadedFile.isAllowed(userId = driveLink.userId)) {
+                val checksumVerified = driveLink.link.activeRevisionChecksumVerified
                 verifyDownloadedFile(
                     driveLink = driveLink,
-                    revisionId = revisionId,
                     file = file,
                 )
                     .onSuccess {
                         integrityMetricsNotifier.downloadVerifier(
                             fileSize = file.length().bytes,
                             isSuccess = true,
+                            checksumVerified = checksumVerified,
                         )
                     }
                     .recoverCatching { error ->
                         if (error is ContentDigestVerifierException.Mismatch) {
                             val fileSize = file.length().bytes
-                            file.delete()
                             integrityMetricsNotifier.downloadVerifier(
                                 fileSize = fileSize,
                                 isSuccess = false,
+                                checksumVerified = checksumVerified,
                                 throwable = error,
                             )
-                            throw error
+                            if (checksumVerified) {
+                                file.delete()
+                                throw error
+                            } else {
+                                reportError(
+                                    tag = LogTag.DOWNLOAD,
+                                    error = error,
+                                    message = buildString {
+                                        append("ContentDigestVerifierException.Mismatch ChecksumVerified=false, ")
+                                        append("revisionId=${revisionId}, ")
+                                        append("creationTime=${driveLink.link.creationTime.captureTime(dateTimeFormatter)}")
+                                    },
+                                )
+                            }
                         } else {
                             integrityMetricsNotifier.downloadVerifier(
                                 fileSize = file.length().bytes,
                                 isSuccess = true,
+                                checksumVerified = checksumVerified,
                                 throwable = error,
                             )
                         }
                     }
                     .getOrThrow()
             }
-            setDownloadState(fileId, DownloadState.Ready)
         }.onFailure { error ->
             reportError(
                 tag = DOWNLOAD,
                 error = error,
                 message = "Cannot download ${fileId.id} (sdk)",
             )
-            setDownloadState(fileId, DownloadState.Error)
         }
     }
 
diff --git a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/GetDownloadProgress.kt b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/GetDownloadProgress.kt
index 10d45821..6d626071 100644
--- a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/GetDownloadProgress.kt
+++ b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/GetDownloadProgress.kt
@@ -26,5 +26,5 @@ class GetDownloadProgress @Inject constructor(
 ) {
     operator fun invoke(
         driveLink: DriveLink.File,
-    ) = downloadManager.getProgressFlow(driveLink)
+    ) = downloadManager.getProgressFlow(driveLink.id)
 }
diff --git a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/GetFile.kt b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/GetFile.kt
index e22485b9..7e68091b 100644
--- a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/GetFile.kt
+++ b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/GetFile.kt
@@ -117,7 +117,7 @@ class GetFile @Inject constructor(
             CoreLogger.w(LogTag.GET_FILE, "Download ${driveLink.id.id} failed as it is not retryable and there is no network connection")
             return@flow emit(State.Error.NoConnection)
         }
-        download(driveLink, retryable)
+        download(driveLink, retryable).getOrThrow()
         try {
             waitForDownloadToFinish(driveLink)
         } catch (e: Exception) {
diff --git a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/VerifyDownloadedFile.kt b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/VerifyDownloadedFile.kt
index 39f0cccf..5a871040 100644
--- a/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/VerifyDownloadedFile.kt
+++ b/drive/drivelink-download/domain/src/main/kotlin/me/proton/core/drive/drivelink/download/domain/usecase/VerifyDownloadedFile.kt
@@ -39,7 +39,6 @@ class VerifyDownloadedFile @Inject constructor(
 
     suspend operator fun invoke(
         driveLink: DriveLink.File,
-        revisionId: String,
         file: File,
     ): Result<Unit> = coRunCatching {
         verifyContentDigest(
diff --git a/drive/drivelink-offline/domain/src/main/kotlin/me/proton/core/drive/drivelink/offline/domain/usecase/ToggleOffline.kt b/drive/drivelink-offline/domain/src/main/kotlin/me/proton/core/drive/drivelink/offline/domain/usecase/ToggleOffline.kt
index 1b1a3f39..3d9f1647 100644
--- a/drive/drivelink-offline/domain/src/main/kotlin/me/proton/core/drive/drivelink/offline/domain/usecase/ToggleOffline.kt
+++ b/drive/drivelink-offline/domain/src/main/kotlin/me/proton/core/drive/drivelink/offline/domain/usecase/ToggleOffline.kt
@@ -18,6 +18,7 @@
 package me.proton.core.drive.drivelink.offline.domain.usecase
 
 import me.proton.core.drive.base.domain.log.LogTag
+import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.drivelink.domain.entity.DriveLink
 import me.proton.core.drive.drivelink.download.domain.usecase.CancelDownload
 import me.proton.core.drive.drivelink.download.domain.usecase.Download
@@ -36,14 +37,14 @@ class ToggleOffline @Inject constructor(
     private val cancelDownload: CancelDownload,
     private val moveFileIfExists: MoveFileIfExists,
 ) {
-    suspend operator fun invoke(driveLink: DriveLink, isRetryable: Boolean = true) {
+    suspend operator fun invoke(driveLink: DriveLink, isRetryable: Boolean = true) = coRunCatching {
         val isAvailableOffline = !isLinkOrAnyAncestorMarkedAsOffline(driveLink.id)
         toggleOffline(driveLink.id)
         if (driveLink is DriveLink.File) {
             moveFileIfExists(driveLink).getOrThrow()
         }
         if (isAvailableOffline) {
-            download(driveLink, isRetryable)
+            download(driveLink, isRetryable).getOrThrow()
         } else {
             val isAnyAncestorMarkedAsOffline = isAnyAncestorMarkedAsOffline(driveLink.id)
                 .onFailure { error ->
diff --git a/drive/drivelink-offline/domain/src/main/kotlin/me/proton/core/drive/drivelink/offline/domain/usecase/UpdateOfflineContent.kt b/drive/drivelink-offline/domain/src/main/kotlin/me/proton/core/drive/drivelink/offline/domain/usecase/UpdateOfflineContent.kt
index 56e1d08f..cca94a1a 100644
--- a/drive/drivelink-offline/domain/src/main/kotlin/me/proton/core/drive/drivelink/offline/domain/usecase/UpdateOfflineContent.kt
+++ b/drive/drivelink-offline/domain/src/main/kotlin/me/proton/core/drive/drivelink/offline/domain/usecase/UpdateOfflineContent.kt
@@ -21,6 +21,7 @@ package me.proton.core.drive.drivelink.offline.domain.usecase
 import kotlinx.coroutines.flow.first
 import me.proton.core.drive.base.domain.extension.toResult
 import me.proton.core.drive.base.domain.log.LogTag.DOWNLOAD
+import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.drivelink.domain.entity.DriveLink
 import me.proton.core.drive.drivelink.domain.usecase.GetDriveLink
 import me.proton.core.drive.drivelink.domain.usecase.GetDriveLinks
@@ -42,22 +43,30 @@ class UpdateOfflineContent @Inject constructor(
     private val download: Download,
     private val cancelDownload: CancelDownload,
 ) {
-    suspend operator fun invoke(linkId: LinkId) = invoke(listOf(linkId))
+    suspend operator fun invoke(linkId: LinkId) = coRunCatching {
+        invoke(listOf(linkId)).getOrThrow()
+    }
 
     // JvmName is required otherwise there is a signature clash with the other invoke
     @JvmName("updateContentForIds")
-    suspend operator fun invoke(linkIds: List<LinkId>) = linkIds.takeIfNotEmpty()?.let {
-        invoke(getDriveLinks(linkIds).first())
+    suspend operator fun invoke(linkIds: List<LinkId>) = coRunCatching {
+        linkIds.takeIfNotEmpty()?.let {
+            invoke(getDriveLinks(linkIds).first()).getOrThrow()
+        }
     }
 
-    suspend operator fun invoke(driveLinks: List<DriveLink>) {
+    suspend operator fun invoke(driveLinks: List<DriveLink>) = coRunCatching {
         driveLinks.forEach { driveLink ->
             val firstMarkedOfflineLink = getFirstMarkedOfflineLink(driveLink.id)
             if (firstMarkedOfflineLink != null) {
                 getDriveLink(firstMarkedOfflineLink.id).toResult().onSuccess { parent ->
-                    download(parent)
+                    download(parent).getOrThrow()
                 }.onFailure { error ->
-                    CoreLogger.w(DOWNLOAD, error, "Cannot get drive link for ${firstMarkedOfflineLink.id.id}")
+                    CoreLogger.w(
+                        DOWNLOAD,
+                        error,
+                        "Cannot get drive link for ${firstMarkedOfflineLink.id.id}"
+                    )
                 }
             } else if (driveLink is DriveLink.File) {
                 cancelDownload(driveLink)
diff --git a/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/db/DriveLinkPhotoDatabase.kt b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/db/DriveLinkPhotoDatabase.kt
index f8ac302a..6015f3d5 100644
--- a/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/db/DriveLinkPhotoDatabase.kt
+++ b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/db/DriveLinkPhotoDatabase.kt
@@ -23,12 +23,10 @@ import me.proton.core.data.room.db.Database
 import me.proton.core.data.room.db.extension.dropTable
 import me.proton.core.data.room.db.migration.DatabaseMigration
 import me.proton.core.drive.drivelink.photo.data.db.dao.AlbumPhotoListingRemoteKeyDao
-import me.proton.core.drive.drivelink.photo.data.db.dao.PhotoListingRemoteKeyDao
-import me.proton.core.drive.drivelink.photo.data.db.dao.TaggedPhotoListingRemoteKeyDao
+import me.proton.core.drive.drivelink.photo.data.db.dao.PhotoListingAnchorDao
 
 interface DriveLinkPhotoDatabase : Database {
-    val photoListingRemoteKeyDao: PhotoListingRemoteKeyDao
-    val taggedPhotoListingRemoteKeyDao: TaggedPhotoListingRemoteKeyDao
+    val photoListingAnchorDao: PhotoListingAnchorDao
     val albumPhotoListingRemoteKeyDao: AlbumPhotoListingRemoteKeyDao
 
     companion object {
@@ -157,5 +155,25 @@ interface DriveLinkPhotoDatabase : Database {
                 """.trimIndent())
             }
         }
+
+        val MIGRATION_4 = object : DatabaseMigration {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS `PhotoListingAnchorEntity` (
+                    `key` TEXT NOT NULL,
+                    `user_id` TEXT NOT NULL,
+                    `volume_id` TEXT NOT NULL,
+                    `next_key` TEXT,
+                    `is_complete` INTEGER NOT NULL,
+                    PRIMARY KEY(`key`, `volume_id`),
+                    FOREIGN KEY(`user_id`) REFERENCES `AccountEntity`(`userId`) ON UPDATE NO ACTION ON DELETE CASCADE
+                    )
+                    """.trimIndent()
+                )
+                database.dropTable("PhotoListingRemoteKeyEntity")
+                database.dropTable("TaggedPhotoListingRemoteKeyEntity")
+            }
+        }
     }
 }
diff --git a/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/db/dao/PhotoListingAnchorDao.kt b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/db/dao/PhotoListingAnchorDao.kt
new file mode 100644
index 00000000..d03542d2
--- /dev/null
+++ b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/db/dao/PhotoListingAnchorDao.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.drivelink.photo.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import me.proton.core.data.room.db.BaseDao
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.drivelink.photo.data.db.entity.PhotoListingAnchorEntity
+
+@Dao
+abstract class PhotoListingAnchorDao : BaseDao<PhotoListingAnchorEntity>() {
+
+    @Query(
+        """
+        SELECT * FROM PhotoListingAnchorEntity
+        WHERE user_id = :userId AND `key` = :key AND volume_id = :volumeId
+        """
+    )
+    abstract suspend fun getAnchor(key: String, userId: UserId, volumeId: String): PhotoListingAnchorEntity?
+
+    @Query(
+        """
+        DELETE FROM PhotoListingAnchorEntity
+        WHERE user_id = :userId AND `key` = :key AND volume_id = :volumeId
+        """
+    )
+    abstract suspend fun deleteAnchor(key: String, userId: UserId, volumeId: String)
+}
diff --git a/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/db/entity/PhotoListingAnchorEntity.kt b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/db/entity/PhotoListingAnchorEntity.kt
new file mode 100644
index 00000000..e28b10ad
--- /dev/null
+++ b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/db/entity/PhotoListingAnchorEntity.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.drivelink.photo.data.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import me.proton.core.account.data.entity.AccountEntity
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.data.db.Column
+import me.proton.core.drive.base.data.db.Column.IS_COMPLETE
+import me.proton.core.drive.base.data.db.Column.KEY
+import me.proton.core.drive.base.data.db.Column.NEXT_KEY
+import me.proton.core.drive.base.data.db.Column.USER_ID
+import me.proton.core.drive.base.data.db.Column.VOLUME_ID
+
+@Entity(
+    primaryKeys = [KEY, VOLUME_ID],
+    foreignKeys = [
+        ForeignKey(
+            entity = AccountEntity::class,
+            parentColumns = [Column.Core.USER_ID],
+            childColumns = [USER_ID],
+            onDelete = ForeignKey.CASCADE
+        ),
+    ],
+)
+data class PhotoListingAnchorEntity(
+    @ColumnInfo(name = USER_ID)
+    val userId: UserId,
+    @ColumnInfo(name = KEY)
+    val key: String,
+    @ColumnInfo(name = VOLUME_ID)
+    val volumeId: String,
+    @ColumnInfo(name = NEXT_KEY)
+    val nextKey: String?,
+    @ColumnInfo(name = IS_COMPLETE)
+    val isComplete: Boolean,
+)
diff --git a/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/di/DriveLinkPhotoBindModule.kt b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/di/DriveLinkPhotoBindModule.kt
index 1f8ed8d4..89be997d 100644
--- a/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/di/DriveLinkPhotoBindModule.kt
+++ b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/di/DriveLinkPhotoBindModule.kt
@@ -23,24 +23,24 @@ import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import me.proton.core.drive.drivelink.photo.data.paging.AlbumPhotoListingRemoteMediatorFactoryImpl
-import me.proton.core.drive.drivelink.photo.data.paging.PhotoListingRemoteMediatorFactoryImpl
+import me.proton.core.drive.drivelink.photo.data.repository.PhotoListingAnchorRepositoryImpl
 import me.proton.core.drive.drivelink.photo.domain.paging.AlbumPhotoListingRemoteMediatorFactory
-import me.proton.core.drive.drivelink.photo.domain.paging.PhotoListingRemoteMediatorFactory
+import me.proton.core.drive.drivelink.photo.domain.repository.PhotoListingAnchorRepository
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 interface DriveLinkPhotoBindModule {
 
-    @Binds
-    @Singleton
-    fun bindsPhotoListingRemoteMediatorFactory(
-        impl: PhotoListingRemoteMediatorFactoryImpl,
-    ): PhotoListingRemoteMediatorFactory
-
     @Binds
     @Singleton
     fun bindsAlbumPhotoListingRemoteMediatorFactory(
         impl: AlbumPhotoListingRemoteMediatorFactoryImpl,
     ): AlbumPhotoListingRemoteMediatorFactory
+
+    @Binds
+    @Singleton
+    fun bindsPhotoListingAnchorRepository(
+        impl: PhotoListingAnchorRepositoryImpl,
+    ): PhotoListingAnchorRepository
 }
diff --git a/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/di/DriveLinkPhotoModule.kt b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/di/DriveLinkPhotoModule.kt
index 3a3e968e..4ecdd4d6 100644
--- a/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/di/DriveLinkPhotoModule.kt
+++ b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/di/DriveLinkPhotoModule.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 Proton AG.
+ * Copyright (c) 2026 Proton AG.
  * This file is part of Proton Core.
  *
  * Proton Core is free software: you can redistribute it and/or modify
@@ -22,35 +22,29 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import me.proton.core.drive.base.domain.provider.ConfigurationProvider
-import me.proton.core.drive.drivelink.photo.domain.manager.PhotoShareMigrationManager
-import me.proton.core.drive.drivelink.photo.domain.usecase.PhotoShareCleanup
-import me.proton.core.drive.photo.domain.repository.PhotoShareMigrationRepository
-import me.proton.core.drive.volume.domain.usecase.GetVolume
-import me.proton.core.drive.volume.domain.usecase.HasPhotoVolume
+import kotlinx.coroutines.SupervisorJob
+import me.proton.core.drive.drivelink.photo.domain.repository.PhotoListingAnchorRepository
+import me.proton.core.drive.drivelink.photo.domain.usecase.PhotoListingsLoader
+import me.proton.core.drive.drivelink.photo.domain.usecase.RefreshPhotoListings
+import me.proton.core.drive.photo.domain.usecase.FetchAllPhotoListings
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 object DriveLinkPhotoModule {
 
-    @Singleton
     @Provides
-    fun providePhotoShareMigrationManager(
-        photoShareMigrationRepository: PhotoShareMigrationRepository,
-        configurationProvider: ConfigurationProvider,
-        getVolume: GetVolume,
-        photoShareCleanup: PhotoShareCleanup,
-        hasPhotoVolume: HasPhotoVolume,
-    ): PhotoShareMigrationManager =
-        PhotoShareMigrationManager(
-            coroutineContext = Job() + Dispatchers.IO,
-            configurationProvider = configurationProvider,
-            photoShareMigrationRepository = photoShareMigrationRepository,
-            getVolume = getVolume,
-            photoShareCleanup = photoShareCleanup,
-            hasPhotoVolume = hasPhotoVolume,
-        )
+    @Singleton
+    fun providePhotoListingsLoader(
+        fetchAllPhotoListings: FetchAllPhotoListings,
+        refreshPhotoListings: RefreshPhotoListings,
+        photoListingAnchorRepository: PhotoListingAnchorRepository,
+    ): PhotoListingsLoader = PhotoListingsLoader(
+        appScope = CoroutineScope(SupervisorJob() + Dispatchers.IO),
+        fetchAllPhotoListings = fetchAllPhotoListings,
+        refreshPhotoListings = refreshPhotoListings,
+        photoListingAnchorRepository = photoListingAnchorRepository,
+    )
 }
diff --git a/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/extension/PhotoListingAnchorEntity.kt b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/extension/PhotoListingAnchorEntity.kt
new file mode 100644
index 00000000..d344dae0
--- /dev/null
+++ b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/extension/PhotoListingAnchorEntity.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.drivelink.photo.data.extension
+
+import me.proton.core.drive.drivelink.photo.data.db.entity.PhotoListingAnchorEntity
+import me.proton.core.drive.drivelink.photo.domain.entity.PhotoListingAnchor
+import me.proton.core.drive.volume.domain.entity.VolumeId
+
+fun PhotoListingAnchorEntity.toPhotoListingAnchor() = PhotoListingAnchor(
+    userId = userId,
+    key = key,
+    volumeId = VolumeId(volumeId),
+    nextKey = nextKey,
+    isComplete = isComplete,
+)
diff --git a/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/repository/PhotoListingAnchorRepositoryImpl.kt b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/repository/PhotoListingAnchorRepositoryImpl.kt
new file mode 100644
index 00000000..e22b0d4d
--- /dev/null
+++ b/drive/drivelink-photo/data/src/main/kotlin/me/proton/core/drive/drivelink/photo/data/repository/PhotoListingAnchorRepositoryImpl.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.drivelink.photo.data.repository
+
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.drivelink.photo.data.db.DriveLinkPhotoDatabase
+import me.proton.core.drive.drivelink.photo.data.db.entity.PhotoListingAnchorEntity
+import me.proton.core.drive.drivelink.photo.data.extension.toPhotoListingAnchor
+import me.proton.core.drive.drivelink.photo.domain.entity.PhotoListingAnchor
+import me.proton.core.drive.drivelink.photo.domain.repository.PhotoListingAnchorRepository
+import me.proton.core.drive.volume.domain.entity.VolumeId
+import javax.inject.Inject
+
+class PhotoListingAnchorRepositoryImpl @Inject constructor(
+    private val db: DriveLinkPhotoDatabase,
+) : PhotoListingAnchorRepository {
+
+    override suspend fun getAnchor(key: String, userId: UserId, volumeId: VolumeId): PhotoListingAnchor? =
+        db.photoListingAnchorDao.getAnchor(key, userId, volumeId.id)?.toPhotoListingAnchor()
+
+    override suspend fun upsertAnchor(
+        key: String,
+        userId: UserId,
+        volumeId: VolumeId,
+        nextKey: String?,
+        isComplete: Boolean,
+    ) {
+        db.photoListingAnchorDao.insertOrUpdate(
+            PhotoListingAnchorEntity(
+                userId = userId,
+                key = key,
+                volumeId = volumeId.id,
+                nextKey = nextKey,
+                isComplete = isComplete,
+            )
+        )
+    }
+
+    override suspend fun deleteAnchor(key: String, userId: UserId, volumeId: VolumeId) {
+        db.photoListingAnchorDao.deleteAnchor(key, userId, volumeId.id)
+    }
+}
diff --git a/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/entity/PhotoListingAnchor.kt b/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/entity/PhotoListingAnchor.kt
new file mode 100644
index 00000000..ef4b37dc
--- /dev/null
+++ b/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/entity/PhotoListingAnchor.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.drivelink.photo.domain.entity
+
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.link.domain.entity.PhotoTag
+import me.proton.core.drive.volume.domain.entity.VolumeId
+
+data class PhotoListingAnchor(
+    val userId: UserId,
+    val key: String,
+    val volumeId: VolumeId,
+    val nextKey: String?,
+    val isComplete: Boolean,
+) {
+    companion object {
+        const val mainKey = "PHOTO_LISTING"
+        fun tagKey(tag: PhotoTag) = "PHOTO_LISTING_$tag"
+    }
+}
diff --git a/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/entity/PhotoListingsSyncState.kt b/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/entity/PhotoListingsSyncState.kt
new file mode 100644
index 00000000..9674f4ca
--- /dev/null
+++ b/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/entity/PhotoListingsSyncState.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.drivelink.photo.domain.entity
+
+sealed class PhotoListingsSyncState {
+    object Idle : PhotoListingsSyncState()
+    object Loading : PhotoListingsSyncState()
+    object Complete : PhotoListingsSyncState()
+    data class Error(val error: Throwable) : PhotoListingsSyncState()
+}
diff --git a/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/repository/PhotoListingAnchorRepository.kt b/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/repository/PhotoListingAnchorRepository.kt
new file mode 100644
index 00000000..2cc15417
--- /dev/null
+++ b/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/repository/PhotoListingAnchorRepository.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.drivelink.photo.domain.repository
+
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.drivelink.photo.domain.entity.PhotoListingAnchor
+import me.proton.core.drive.volume.domain.entity.VolumeId
+
+interface PhotoListingAnchorRepository {
+
+    suspend fun getAnchor(key: String, userId: UserId, volumeId: VolumeId): PhotoListingAnchor?
+
+    suspend fun upsertAnchor(key: String, userId: UserId, volumeId: VolumeId, nextKey: String?, isComplete: Boolean)
+
+    suspend fun deleteAnchor(key: String, userId: UserId, volumeId: VolumeId)
+}
diff --git a/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/usecase/GetPhotoListingsPagingData.kt b/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/usecase/GetPhotoListingsPagingData.kt
new file mode 100644
index 00000000..a42b10c8
--- /dev/null
+++ b/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/usecase/GetPhotoListingsPagingData.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.drivelink.photo.domain.usecase
+
+import androidx.paging.LoadState
+import androidx.paging.LoadStates
+import androidx.paging.PagingData
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.transformLatest
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.domain.log.LogTag
+import me.proton.core.drive.base.domain.provider.ConfigurationProvider
+import me.proton.core.drive.base.domain.usecase.ReportError
+import me.proton.core.drive.link.domain.entity.PhotoTag
+import me.proton.core.drive.photo.domain.entity.PhotoListing
+import me.proton.core.drive.photo.domain.repository.PhotoRepository
+import me.proton.core.drive.volume.domain.entity.VolumeId
+import javax.inject.Inject
+
+class GetPhotoListingsPagingData @Inject constructor(
+    private val photoRepository: PhotoRepository,
+    private val configurationProvider: ConfigurationProvider,
+    private val reportError: ReportError,
+) {
+    @OptIn(ExperimentalCoroutinesApi::class)
+    operator fun <T : Any> invoke(
+        userId: UserId,
+        volumeId: VolumeId,
+        tag: PhotoTag?,
+        transform: suspend (PhotoListing) -> T,
+    ): Flow<PagingData<T>> =
+        photoRepository.getPhotoListingCount(userId, volumeId, tag)
+            .debounce(300)
+            .transformLatest { count ->
+                if (count == 0) emit(pagingDataLoading())
+                try {
+                    val items = loadAllPages(userId, volumeId, tag, transform)
+                    emit(pagingDataComplete(items))
+                } catch (e: CancellationException) {
+                    throw e
+                } catch (e: OutOfMemoryError) {
+                    System.gc()
+                    reportError(LogTag.PHOTO, e, "OutOfMemoryError occurred while loading $count photo listings from DB")
+                    emit(pagingDataError(e))
+                } catch (e: Exception) {
+                    emit(pagingDataError(e))
+                }
+            }
+
+    private fun <T : Any> pagingDataLoading(): PagingData<T> = PagingData.from(
+        data = emptyList(),
+        sourceLoadStates = LoadStates(
+            refresh = LoadState.Loading,
+            prepend = LoadState.NotLoading(endOfPaginationReached = true),
+            append = LoadState.NotLoading(endOfPaginationReached = true),
+        ),
+    )
+
+    private fun <T : Any> pagingDataComplete(items: List<T>): PagingData<T> = PagingData.from(
+        data = items,
+        sourceLoadStates = LoadStates(
+            refresh = LoadState.NotLoading(endOfPaginationReached = true),
+            prepend = LoadState.NotLoading(endOfPaginationReached = true),
+            append = LoadState.NotLoading(endOfPaginationReached = true),
+        ),
+    )
+
+    private fun <T : Any> pagingDataError(e: Throwable): PagingData<T> = PagingData.from(
+        data = emptyList(),
+        sourceLoadStates = LoadStates(
+            refresh = LoadState.Error(e),
+            prepend = LoadState.NotLoading(endOfPaginationReached = true),
+            append = LoadState.NotLoading(endOfPaginationReached = true),
+        ),
+    )
+
+    private suspend fun <T : Any> loadAllPages(
+        userId: UserId,
+        volumeId: VolumeId,
+        tag: PhotoTag?,
+        transform: suspend (PhotoListing) -> T,
+    ): List<T> {
+        val result = mutableListOf<T>()
+        var offset = 0
+        while (true) {
+            val page = photoRepository.getPhotoListings(
+                userId = userId,
+                volumeId = volumeId,
+                fromIndex = offset,
+                count = configurationProvider.dbPageSize,
+                tag = tag,
+            )
+            page.mapTo(result) { transform(it) }
+            if (page.size < configurationProvider.dbPageSize) break
+            offset += configurationProvider.dbPageSize
+        }
+        return result
+    }
+}
diff --git a/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/usecase/PhotoListingsLoader.kt b/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/usecase/PhotoListingsLoader.kt
new file mode 100644
index 00000000..622e2b6e
--- /dev/null
+++ b/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/usecase/PhotoListingsLoader.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.drivelink.photo.domain.usecase
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.domain.log.LogTag
+import me.proton.core.drive.drivelink.photo.domain.entity.PhotoListingsSyncState
+import me.proton.core.drive.drivelink.photo.domain.repository.PhotoListingAnchorRepository
+import me.proton.core.drive.link.domain.entity.PhotoTag
+import me.proton.core.drive.photo.domain.usecase.FetchAllPhotoListings
+import me.proton.core.drive.share.domain.entity.ShareId
+import me.proton.core.drive.volume.domain.entity.VolumeId
+import me.proton.core.util.kotlin.CoreLogger
+import java.util.concurrent.ConcurrentHashMap
+
+class PhotoListingsLoader(
+    private val appScope: CoroutineScope,
+    private val fetchAllPhotoListings: FetchAllPhotoListings,
+    private val refreshPhotoListings: RefreshPhotoListings,
+    private val photoListingAnchorRepository: PhotoListingAnchorRepository,
+) {
+    private val mutex = Mutex()
+    private val jobs = ConcurrentHashMap<String, Job>()
+    private val states = ConcurrentHashMap<String, MutableStateFlow<PhotoListingsSyncState>>()
+
+    fun stateFor(key: String): StateFlow<PhotoListingsSyncState> = mutableStateFor(key)
+
+    fun load(key: String, userId: UserId, volumeId: VolumeId, shareId: ShareId, tag: PhotoTag?) {
+        appScope.launch {
+            mutex.withLock {
+                if (jobs[key]?.isActive == true) return@withLock
+                startJob(key, userId, volumeId, shareId, tag)
+            }
+        }
+    }
+
+    fun retry(key: String, userId: UserId, volumeId: VolumeId, shareId: ShareId, tag: PhotoTag?) =
+        load(key, userId, volumeId, shareId, tag)
+
+    fun refresh(key: String, userId: UserId, volumeId: VolumeId, shareId: ShareId, tag: PhotoTag?) {
+        CoreLogger.d(LogTag.PHOTO, "[$key] refresh requested")
+        appScope.launch {
+            mutex.withLock {
+                jobs[key]?.cancel()
+                jobs.remove(key)
+                mutableStateFor(key).value = PhotoListingsSyncState.Idle
+                refreshPhotoListings(userId, volumeId, tag)
+                    .onFailure { error ->
+                        CoreLogger.d(LogTag.PHOTO, error, "[$key] refresh cleanup failed")
+                        mutableStateFor(key).value = PhotoListingsSyncState.Error(error)
+                        return@withLock
+                    }
+                startJob(key, userId, volumeId, shareId, tag)
+            }
+        }
+    }
+
+    private fun mutableStateFor(key: String): MutableStateFlow<PhotoListingsSyncState> =
+        states.getOrPut(key) { MutableStateFlow(PhotoListingsSyncState.Idle) }
+
+    private fun startJob(key: String, userId: UserId, volumeId: VolumeId, shareId: ShareId, tag: PhotoTag?) {
+        mutableStateFor(key).value = PhotoListingsSyncState.Loading
+        jobs[key] = appScope.launch {
+            val anchor = photoListingAnchorRepository.getAnchor(key, userId, volumeId)
+            if (anchor?.isComplete == true) {
+                CoreLogger.d(LogTag.PHOTO, "[$key] already complete, skipping load")
+                mutableStateFor(key).value = PhotoListingsSyncState.Complete
+                return@launch
+            }
+            CoreLogger.d(LogTag.PHOTO, "[$key] load started (anchor.nextKey=${anchor?.nextKey})")
+            var totalLoaded = 0
+            fetchAllPhotoListings(
+                userId = userId,
+                volumeId = volumeId,
+                shareId = shareId,
+                tag = tag,
+                initialPageKey = anchor?.nextKey,
+                postPageProcess = { nextKey, isComplete, pageCount ->
+                    totalLoaded += pageCount
+                    photoListingAnchorRepository.upsertAnchor(
+                        userId = userId,
+                        key = key,
+                        volumeId = volumeId,
+                        nextKey = nextKey,
+                        isComplete = isComplete,
+                    )
+                },
+            )
+                .onSuccess {
+                    CoreLogger.d(LogTag.PHOTO, "[$key] load complete, total=$totalLoaded")
+                    mutableStateFor(key).value = PhotoListingsSyncState.Complete
+                }
+                .onFailure { error ->
+                    CoreLogger.d(LogTag.PHOTO, error, "[$key] load failed after $totalLoaded items")
+                    mutableStateFor(key).value = PhotoListingsSyncState.Error(error)
+                }
+        }
+    }
+}
diff --git a/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/usecase/RefreshPhotoListings.kt b/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/usecase/RefreshPhotoListings.kt
new file mode 100644
index 00000000..a8f22cd3
--- /dev/null
+++ b/drive/drivelink-photo/domain/src/main/kotlin/me/proton/core/drive/drivelink/photo/domain/usecase/RefreshPhotoListings.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.drivelink.photo.domain.usecase
+
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.domain.util.coRunCatching
+import me.proton.core.drive.drivelink.photo.domain.entity.PhotoListingAnchor
+import me.proton.core.drive.drivelink.photo.domain.repository.PhotoListingAnchorRepository
+import me.proton.core.drive.link.domain.entity.PhotoTag
+import me.proton.core.drive.photo.domain.repository.PhotoRepository
+import me.proton.core.drive.volume.domain.entity.VolumeId
+import javax.inject.Inject
+
+class RefreshPhotoListings @Inject constructor(
+    private val photoRepository: PhotoRepository,
+    private val photoListingAnchorRepository: PhotoListingAnchorRepository,
+) {
+
+    suspend operator fun invoke(userId: UserId, volumeId: VolumeId, tag: PhotoTag?): Result<Unit> = coRunCatching {
+        photoRepository.deleteAll(userId, volumeId, tag)
+        val key = tag?.let { PhotoListingAnchor.tagKey(it) } ?: PhotoListingAnchor.mainKey
+        photoListingAnchorRepository.deleteAnchor(key, userId, volumeId)
+    }
+}
diff --git a/drive/drivelink-rename/domain/src/main/kotlin/me/proton/core/drive/drivelink/rename/domain/usecase/RenameLink.kt b/drive/drivelink-rename/domain/src/main/kotlin/me/proton/core/drive/drivelink/rename/domain/usecase/RenameLink.kt
index e5e47426..59e0da86 100644
--- a/drive/drivelink-rename/domain/src/main/kotlin/me/proton/core/drive/drivelink/rename/domain/usecase/RenameLink.kt
+++ b/drive/drivelink-rename/domain/src/main/kotlin/me/proton/core/drive/drivelink/rename/domain/usecase/RenameLink.kt
@@ -29,7 +29,6 @@ import me.proton.core.drive.link.domain.extension.userId
 import me.proton.core.drive.link.domain.usecase.GetLink
 import me.proton.core.drive.link.domain.usecase.ValidateLinkName
 import me.proton.core.drive.share.domain.usecase.GetShare
-import me.proton.drive.sdk.Uid
 import javax.inject.Inject
 
 class RenameLink @Inject constructor(
diff --git a/drive/drivelink-rename/domain/src/main/kotlin/me/proton/core/drive/drivelink/rename/domain/usecase/RenameLinkSdk.kt b/drive/drivelink-rename/domain/src/main/kotlin/me/proton/core/drive/drivelink/rename/domain/usecase/RenameLinkSdk.kt
index d547f6e2..61371377 100644
--- a/drive/drivelink-rename/domain/src/main/kotlin/me/proton/core/drive/drivelink/rename/domain/usecase/RenameLinkSdk.kt
+++ b/drive/drivelink-rename/domain/src/main/kotlin/me/proton/core/drive/drivelink/rename/domain/usecase/RenameLinkSdk.kt
@@ -23,6 +23,7 @@ import me.proton.core.drive.base.domain.provider.ProtonDriveClientProvider
 import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.eventmanager.base.domain.usecase.UpdateEventAction
 import me.proton.core.drive.link.domain.usecase.ValidateLinkName
+import me.proton.drive.sdk.entity.NodeUid
 import javax.inject.Inject
 
 class RenameLinkSdk @Inject constructor(
@@ -32,7 +33,7 @@ class RenameLinkSdk @Inject constructor(
 ) {
     suspend operator fun invoke(
         userId: UserId,
-        nodeUid: String,
+        nodeUid: NodeUid,
         linkName: String,
     ): Result<Unit> = coRunCatching {
         // TODO: Remove when SDK validate name
diff --git a/drive/drivelink-selection/domain/src/main/kotlin/me/proton/core/drive/drivelink/selection/domain/usecase/GetSelectedDriveLinks.kt b/drive/drivelink-selection/domain/src/main/kotlin/me/proton/core/drive/drivelink/selection/domain/usecase/GetSelectedDriveLinks.kt
index 88e58475..dd536638 100644
--- a/drive/drivelink-selection/domain/src/main/kotlin/me/proton/core/drive/drivelink/selection/domain/usecase/GetSelectedDriveLinks.kt
+++ b/drive/drivelink-selection/domain/src/main/kotlin/me/proton/core/drive/drivelink/selection/domain/usecase/GetSelectedDriveLinks.kt
@@ -46,17 +46,16 @@ class GetSelectedDriveLinks @Inject constructor(
                         deselectLinks(
                             selectionId,
                             (driveLinks - children.toSet()).map { driveLink -> driveLink.id },
-                        )
+                        ).getOrThrow()
                     }
             }
 
     private fun getSelectedDriveLinks(selectionId: SelectionId): Flow<List<DriveLink>> =
         repository.getSelectedDriveLinks(selectionId)
             .map { driveLinks ->
-                driveLinks.map { driveLink ->
-                    driveLink
-                        .let { link -> updateSharePermissions(link) }
-                        .let { link -> updateShareUserDisplayName(link) }
-                }
+                @Suppress("ComplexRedundantLet")
+                driveLinks
+                    .let { links -> updateSharePermissions(links) }
+                    .let { links -> updateShareUserDisplayName(links) }
             }
 }
diff --git a/drive/drivelink-selection/domain/src/main/kotlin/me/proton/core/drive/drivelink/selection/domain/usecase/SelectAll.kt b/drive/drivelink-selection/domain/src/main/kotlin/me/proton/core/drive/drivelink/selection/domain/usecase/SelectAll.kt
index b39c2709..8fb12e17 100644
--- a/drive/drivelink-selection/domain/src/main/kotlin/me/proton/core/drive/drivelink/selection/domain/usecase/SelectAll.kt
+++ b/drive/drivelink-selection/domain/src/main/kotlin/me/proton/core/drive/drivelink/selection/domain/usecase/SelectAll.kt
@@ -46,7 +46,7 @@ class SelectAll @Inject constructor(
         },
         selectLinks = { id, linkIds ->
             id?.let {
-                selectLinks(id, linkIds)
+                selectLinks(id, linkIds).getOrThrow()
                 Result.success(id)
             } ?: selectLinks(linkIds)
         },
diff --git a/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/LinkSettings.kt b/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/LinkSettings.kt
index d84ce33e..93c17194 100644
--- a/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/LinkSettings.kt
+++ b/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/LinkSettings.kt
@@ -93,6 +93,7 @@ fun LinkSettings(
         BackHandler { viewEvent.onBackPressed() }
         TopAppBar(
             navigationIcon = painterResource(id = CorePresentation.drawable.ic_arrow_back),
+            navigationContentDescription = stringResource(I18N.string.common_back_action),
             onNavigationIcon = viewEvent.onBackPressed,
             title = stringResource(id = I18N.string.shared_link_settings),
             modifier = Modifier.statusBarsPadding(),
diff --git a/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/ManageAccess.kt b/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/ManageAccess.kt
index ba9f2520..2220c9ea 100644
--- a/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/ManageAccess.kt
+++ b/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/ManageAccess.kt
@@ -100,6 +100,7 @@ private fun ManageAccess(
     ) {
         TopAppBar(
             navigationIcon = painterResource(id = CorePresentation.drawable.ic_arrow_back),
+            navigationContentDescription = stringResource(I18N.string.common_back_action),
             onNavigationIcon = viewEvent.onBackPressed,
             title = viewState?.title ?: "",
             modifier = Modifier.statusBarsPadding(),
diff --git a/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/ShareViaLink.kt b/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/ShareViaLink.kt
index e1f1ad9b..799ae348 100644
--- a/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/ShareViaLink.kt
+++ b/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/ShareViaLink.kt
@@ -91,6 +91,7 @@ fun ShareViaLink(
         val focusManager = LocalFocusManager.current
         TopAppBar(
             navigationIcon = painterResource(id = CorePresentation.drawable.ic_arrow_back),
+            navigationContentDescription = stringResource(I18N.string.common_back_action),
             onNavigationIcon = viewEvent.onBackPressed,
             title = stringResource(id = I18N.string.title_share_via_link),
             modifier = Modifier.statusBarsPadding(),
diff --git a/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/SharedDriveInvitations.kt b/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/SharedDriveInvitations.kt
index d1436950..83ac2dbd 100644
--- a/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/SharedDriveInvitations.kt
+++ b/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/SharedDriveInvitations.kt
@@ -101,6 +101,7 @@ fun SharedDriveInvitations(
         Column(modifier = Modifier.weight(1F)) {
             TopAppBar(
                 navigationIcon = painterResource(id = CorePresentation.drawable.ic_arrow_back),
+                navigationContentDescription = stringResource(I18N.string.common_back_action),
                 onNavigationIcon = viewEvent.onBackPressed,
                 title = stringResource(
                     id = I18N.string.title_share_via_invitations,
diff --git a/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/UserInvitation.kt b/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/UserInvitation.kt
index 63fef7fe..c74f455c 100644
--- a/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/UserInvitation.kt
+++ b/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/component/UserInvitation.kt
@@ -133,6 +133,7 @@ private fun TopAppBar(
         navigationIcon = if (viewState.navigationIconResId != 0) {
             painterResource(id = viewState.navigationIconResId)
         } else null,
+        navigationContentDescription = viewState.navigationContentDescription,
         onNavigationIcon = viewEvent.onTopAppBarNavigation,
         title = viewState.title,
     )
@@ -153,6 +154,7 @@ fun UserInvitationContentPreview() {
             viewState = UserInvitationViewState(
                 title = stringResource(I18N.string.shared_user_invitations_title, 2),
                 navigationIconResId = CorePresentation.drawable.ic_arrow_back,
+                navigationContentDescription = null,
                 listContentState = ListContentState.Content(isRefreshing = false)
             ),
             viewEvent = viewEvent,
@@ -189,6 +191,7 @@ fun UserInvitationEmptyPreview() {
             viewState = UserInvitationViewState(
                 title = stringResource(I18N.string.shared_user_invitations_title, 0),
                 navigationIconResId = CorePresentation.drawable.ic_arrow_back,
+                navigationContentDescription = null,
                 listContentState = ListContentState.Empty(
                     imageResId = getThemeDrawableId(
                         light = me.proton.core.drive.base.presentation.R.drawable.empty_shared_with_me_light,
@@ -213,6 +216,7 @@ fun UserInvitationErrorPreview() {
             viewState = UserInvitationViewState(
                 title = stringResource(I18N.string.shared_user_invitations_title, 0),
                 navigationIconResId = CorePresentation.drawable.ic_arrow_back,
+                navigationContentDescription = null,
                 listContentState = ListContentState.Error(
                     message = "error"
                 )
@@ -231,6 +235,7 @@ fun UserInvitationLoadingPreview() {
             viewState = UserInvitationViewState(
                 title = stringResource(I18N.string.shared_user_invitations_title, 0),
                 navigationIconResId = CorePresentation.drawable.ic_arrow_back,
+                navigationContentDescription = null,
                 listContentState = ListContentState.Loading,
             ),
             viewEvent = viewEvent,
diff --git a/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/viewstate/UserInvitationViewState.kt b/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/viewstate/UserInvitationViewState.kt
index e501a272..3933e898 100644
--- a/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/viewstate/UserInvitationViewState.kt
+++ b/drive/drivelink-shared/presentation/src/main/kotlin/me/proton/core/drive/drivelink/shared/presentation/viewstate/UserInvitationViewState.kt
@@ -24,5 +24,6 @@ import me.proton.core.drive.base.presentation.state.ListContentState
 data class UserInvitationViewState(
     val title: String,
     @DrawableRes val navigationIconResId: Int,
+    val navigationContentDescription: String?,
     val listContentState: ListContentState,
 )
diff --git a/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/extension/DriveLink.kt b/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/extension/DriveLink.kt
index 44259f68..c71df184 100644
--- a/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/extension/DriveLink.kt
+++ b/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/extension/DriveLink.kt
@@ -30,6 +30,7 @@ import me.proton.core.drive.link.domain.entity.Link
 import me.proton.core.drive.link.domain.extension.hasShareLink
 import me.proton.core.drive.link.domain.extension.isPhoto
 import me.proton.core.drive.link.domain.extension.isSharedByLinkOrWithUsers
+import me.proton.core.drive.link.domain.extension.shareId
 import me.proton.core.drive.photo.domain.entity.PhotoListing
 
 fun DriveLink.updateLastModified(lastModified: TimestampS) = link.let { link ->
@@ -60,7 +61,7 @@ val DriveLink.isSharedWithUsers: Boolean
     get() = (shareInvitationCount ?: 0) > 0 || (shareMemberCount ?: 0) > 0
 
 val DriveLink.isShareMember: Boolean
-    get() = sharePermissions?.isOwner == false
+    get() = sharePermissions?.isOwner == false && shareUser?.id != null && shareId == link.sharingDetails?.shareId
 
 val DriveLink.isShareReadOnly: Boolean get() = sharePermissions?.let { sharePermissions ->
     sharePermissions.canRead && !sharePermissions.canWrite
diff --git a/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/usecase/GetDriveLinks.kt b/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/usecase/GetDriveLinks.kt
index 39020a44..d4ab562e 100644
--- a/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/usecase/GetDriveLinks.kt
+++ b/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/usecase/GetDriveLinks.kt
@@ -36,10 +36,9 @@ class GetDriveLinks @Inject constructor(
         driveLinkRepository
             .getDriveLinks(linkIds)
             .map { driveLinks ->
-                driveLinks.map { driveLink ->
-                    driveLink
-                        .let { link -> updateSharePermissions(link) }
-                        .let { link -> updateShareUserDisplayName(link) }
-                }
+                @Suppress("ComplexRedundantLet")
+                driveLinks
+                    .let { links -> updateSharePermissions(links) }
+                    .let { links -> updateShareUserDisplayName(links) }
             }
 }
diff --git a/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/usecase/UpdateSharePermissions.kt b/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/usecase/UpdateSharePermissions.kt
index 2f37b10f..1482e663 100644
--- a/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/usecase/UpdateSharePermissions.kt
+++ b/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/usecase/UpdateSharePermissions.kt
@@ -26,39 +26,64 @@ import me.proton.core.drive.drivelink.domain.entity.DriveLink
 import me.proton.core.drive.link.domain.extension.shareId
 import me.proton.core.drive.link.domain.extension.userId
 import me.proton.core.drive.linknode.domain.usecase.GetLinkAncestors
-import me.proton.core.drive.share.crypto.domain.usecase.GetPhotoShare
 import me.proton.core.drive.share.domain.entity.Share
 import me.proton.core.drive.share.domain.usecase.GetHighestSharePermissions
-import me.proton.core.drive.share.domain.usecase.GetMainShare
 import me.proton.core.drive.share.domain.usecase.GetShare
+import me.proton.core.drive.volume.domain.entity.Volume
+import me.proton.core.drive.volume.domain.usecase.GetActiveVolumes
 import javax.inject.Inject
 
 class UpdateSharePermissions @Inject constructor(
-    private val getMainShare: GetMainShare,
-    private val getPhotoShare: GetPhotoShare,
+    private val getActiveVolumes: GetActiveVolumes,
     private val getShare: GetShare,
     private val getLinkAncestors: GetLinkAncestors,
     private val getHighestSharePermissions: GetHighestSharePermissions,
 ) {
     suspend operator fun invoke(driveLink: DriveLink): DriveLink {
-        val share = getShare(driveLink.shareId).toResult().getOrNull(SHARING, "Cannot find share")
+        val share = getShare(driveLink.shareId).toResult()
+            .getOrNull(SHARING, "Cannot find share")
             ?: return driveLink
         val sharePermissions = when (share.type) {
-            Share.Type.STANDARD -> getPermissions(share, driveLink)
+            Share.Type.STANDARD -> {
+                getPermissions(
+                    share = share,
+                    driveLink = driveLink,
+                    volumes = getActiveVolumes(driveLink.userId)
+                        .toResult()
+                        .getOrNull(SHARING, "Cannot get main share")
+                        .orEmpty(),
+                )
+            }
             else -> Permissions.owner
         }
-        return when (driveLink) {
-            is DriveLink.Folder -> driveLink.copy(sharePermissions = sharePermissions)
-            is DriveLink.File -> driveLink.copy(sharePermissions = sharePermissions)
-            is DriveLink.Album -> driveLink.copy(sharePermissions = sharePermissions)
+        return driveLink.copySharePermission(sharePermissions)
+    }
+
+    suspend operator fun invoke(driveLinks: List<DriveLink>): List<DriveLink> {
+        val volumesByUserId = driveLinks.map { it.userId }.distinct()
+            .associateWith { userId -> getActiveVolumes(userId).toResult().getOrNull(SHARING, "Cannot get volumes") }
+        val shareByShareId = driveLinks.map { it.shareId }.distinct()
+            .associateWith { shareId -> getShare(shareId).toResult().getOrNull(SHARING, "Cannot find share") }
+        return driveLinks.map { driveLink ->
+            shareByShareId[driveLink.shareId]?.let{ share ->
+                val sharePermissions = when (share.type) {
+                    Share.Type.STANDARD -> getPermissions(
+                        share = share,
+                        driveLink = driveLink,
+                        volumes = volumesByUserId[driveLink.userId].orEmpty(),
+                    )
+                    else -> Permissions.owner
+                }
+                driveLink.copySharePermission(sharePermissions)
+            } ?: driveLink
         }
     }
 
     private suspend fun getPermissions(
         share: Share,
         driveLink: DriveLink,
-    ): Permissions = checkMainShare(share, driveLink)
-        ?: checkPhotoShare(share, driveLink)
+        volumes: List<Volume>,
+    ): Permissions = share.checkVolumes(volumes)
         ?: checkLinks(driveLink)
 
     private suspend fun checkLinks(driveLink: DriveLink): Permissions =
@@ -68,23 +93,17 @@ class UpdateSharePermissions @Inject constructor(
             getHighestSharePermissions(shareIds).getOrNull(SHARING, "Cannot get share permissions")
         } ?: Permissions.viewer
 
-    private suspend fun checkPhotoShare(
-        share: Share,
-        driveLink: DriveLink
-    ): Permissions? {
-        val photoShare = getPhotoShare(driveLink.userId)
-            .toResult()
-            .getOrNull(SHARING, "Cannot get photo share")
-        return Permissions.owner.takeIf { photoShare?.volumeId == share.volumeId }
-    }
+    private fun Share.checkPhotoShare(photoShare: Share?): Permissions? =
+        Permissions.owner.takeIf { volumeId == photoShare?.volumeId }
 
-    private suspend fun checkMainShare(
-        share: Share,
-        driveLink: DriveLink
-    ): Permissions? {
-        val mainShare = getMainShare(driveLink.userId)
-            .toResult()
-            .getOrNull(SHARING, "Cannot get main share")
-        return Permissions.owner.takeIf { mainShare?.volumeId == share.volumeId }
+    private fun Share.checkVolumes(volumes: List<Volume>): Permissions? =
+        Permissions.owner.takeIf { volumes.any { volume -> volume.id == volumeId } }
+
+    private fun DriveLink.copySharePermission(
+        sharePermissions: Permissions
+    ): DriveLink = when (this) {
+        is DriveLink.Folder -> this.copy(sharePermissions = sharePermissions)
+        is DriveLink.File -> this.copy(sharePermissions = sharePermissions)
+        is DriveLink.Album -> this.copy(sharePermissions = sharePermissions)
     }
 }
diff --git a/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/usecase/UpdateShareUserDisplayName.kt b/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/usecase/UpdateShareUserDisplayName.kt
index 4bc499cb..dfe50d41 100644
--- a/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/usecase/UpdateShareUserDisplayName.kt
+++ b/drive/drivelink/domain/src/main/kotlin/me/proton/core/drive/drivelink/domain/usecase/UpdateShareUserDisplayName.kt
@@ -18,6 +18,7 @@
 
 package me.proton.core.drive.drivelink.domain.usecase
 
+import me.proton.core.contact.domain.entity.ContactEmail
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.contact.domain.usecase.GetContactEmails
 import me.proton.core.drive.drivelink.domain.entity.DriveLink
@@ -46,6 +47,24 @@ class UpdateShareUserDisplayName @Inject constructor(
         }
     }
 
+    suspend operator fun invoke(driveLinks: List<DriveLink>): List<DriveLink> {
+        val displayNameByEmail: Map<String, ContactEmail> = driveLinks
+            .groupBy { it.userId }
+            .entries
+            .flatMap { (userId, links) ->
+                val emails = links.mapNotNull { (it.shareUser as? ShareUser.Member)?.inviter }.toSet()
+                getContactEmails(userId, emails).getOrNull().orEmpty().entries
+            }
+            .associate { (email, contact) -> email to contact }
+        return driveLinks.map { link ->
+            when (link) {
+                is DriveLink.Folder -> link.copy(shareUser = link.shareUser.updateDisplayName(displayNameByEmail))
+                is DriveLink.File -> link.copy(shareUser = link.shareUser.updateDisplayName(displayNameByEmail))
+                is DriveLink.Album -> link.copy(shareUser = link.shareUser.updateDisplayName(displayNameByEmail))
+            }
+        }
+    }
+
     private suspend fun ShareUser?.updateDisplayName(userId: UserId): ShareUser? = when (this) {
         is ShareUser.Member -> copy(
             displayName = getContactEmails(
@@ -55,4 +74,11 @@ class UpdateShareUserDisplayName @Inject constructor(
         )
         else -> this
     }
+
+    private fun ShareUser?.updateDisplayName(
+        displayNames: Map<String, ContactEmail>,
+    ): ShareUser? = when (this) {
+        is ShareUser.Member -> copy(displayName = displayNames[inviter]?.name ?: inviter)
+        else -> this
+    }
 }
diff --git a/drive/event-manager/base/domain/src/main/kotlin/me/proton/core/drive/eventmanager/base/domain/usecase/UpdateEventAction.kt b/drive/event-manager/base/domain/src/main/kotlin/me/proton/core/drive/eventmanager/base/domain/usecase/UpdateEventAction.kt
index 476321f7..0cf42fd9 100644
--- a/drive/event-manager/base/domain/src/main/kotlin/me/proton/core/drive/eventmanager/base/domain/usecase/UpdateEventAction.kt
+++ b/drive/event-manager/base/domain/src/main/kotlin/me/proton/core/drive/eventmanager/base/domain/usecase/UpdateEventAction.kt
@@ -22,7 +22,7 @@ import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.share.domain.entity.ShareId
 import me.proton.core.drive.volume.domain.entity.VolumeId
 import me.proton.core.drive.volume.domain.extension.volumeId
-import me.proton.drive.sdk.Uid
+import me.proton.drive.sdk.entity.NodeUid
 
 interface UpdateEventAction {
 
@@ -41,12 +41,12 @@ interface UpdateEventAction {
 
     suspend operator fun <T> invoke(
         userId: UserId,
-        nodeUid: String,
+        nodeUid: NodeUid,
         overrideMinimumFetchInterval: Boolean = true,
         block: suspend () -> T
     ): T = invoke(
         userId = userId,
-        volumeId = Uid.volumeId(nodeUid),
+        volumeId = nodeUid.volumeId,
         overrideMinimumFetchInterval = overrideMinimumFetchInterval,
         block = block,
     )
diff --git a/drive/event-manager/domain/src/main/kotlin/me/proton/core/drive/eventmanager/usecase/HandleCreateOrUpdateLinksEvent.kt b/drive/event-manager/domain/src/main/kotlin/me/proton/core/drive/eventmanager/usecase/HandleCreateOrUpdateLinksEvent.kt
index 21689ba6..a46af16b 100644
--- a/drive/event-manager/domain/src/main/kotlin/me/proton/core/drive/eventmanager/usecase/HandleCreateOrUpdateLinksEvent.kt
+++ b/drive/event-manager/domain/src/main/kotlin/me/proton/core/drive/eventmanager/usecase/HandleCreateOrUpdateLinksEvent.kt
@@ -19,6 +19,7 @@
 package me.proton.core.drive.eventmanager.usecase
 
 import me.proton.core.drive.base.domain.extension.flowOf
+import me.proton.core.drive.base.domain.extension.getOrNull
 import me.proton.core.drive.base.domain.extension.nullIfNotFound
 import me.proton.core.drive.base.domain.extension.toResult
 import me.proton.core.drive.base.domain.log.LogTag.EVENTS
@@ -64,7 +65,7 @@ class HandleCreateOrUpdateLinksEvent @Inject constructor(
                     updateOfflineContent(
                         modifiedStateOrParentLinks.ids +
                                 links.filterIsInstance<Link.Album>().map { link -> link.id }
-                    )
+                    ).getOrNull(EVENTS, "Failed to update online content")
                     insertOrDeletePhotoListings(volumeId, links.filterVolumePhotoListings(photoShare?.rootFolderId))
                     insertOrDeleteAlbumPhotoListings(volumeId, links.filterIsInstance<Link.File>())
                     insertOrDeleteAlbumListings(volumeId, links.filterIsInstance<Link.Album>())
diff --git a/drive/event-manager/domain/src/main/kotlin/me/proton/core/drive/eventmanager/usecase/OnUpdateContentEvent.kt b/drive/event-manager/domain/src/main/kotlin/me/proton/core/drive/eventmanager/usecase/OnUpdateContentEvent.kt
index b97c62ee..e5fc1b1e 100644
--- a/drive/event-manager/domain/src/main/kotlin/me/proton/core/drive/eventmanager/usecase/OnUpdateContentEvent.kt
+++ b/drive/event-manager/domain/src/main/kotlin/me/proton/core/drive/eventmanager/usecase/OnUpdateContentEvent.kt
@@ -60,7 +60,7 @@ class OnUpdateContentEvent @Inject constructor(
                             .getOrNull(LogTag.EVENTS, "Cannot get drive link ${it.id.id.logId()}")
                     }
                 }
-            )
+            ).getOrNull(LogTag.EVENTS, "Failed to download links")
         }
     }
 
diff --git a/drive/feature-flag/domain/src/main/kotlin/me/proton/core/drive/feature/flag/domain/entity/FeatureFlagId.kt b/drive/feature-flag/domain/src/main/kotlin/me/proton/core/drive/feature/flag/domain/entity/FeatureFlagId.kt
index 961a0394..8373b565 100644
--- a/drive/feature-flag/domain/src/main/kotlin/me/proton/core/drive/feature/flag/domain/entity/FeatureFlagId.kt
+++ b/drive/feature-flag/domain/src/main/kotlin/me/proton/core/drive/feature/flag/domain/entity/FeatureFlagId.kt
@@ -52,12 +52,14 @@ sealed class FeatureFlagId(open val userId: UserId, open val id: String) {
         const val DRIVE_ANDROID_SDK_THUMBNAIL_MAIN = "DriveAndroidSDKThumbnailMain"
         const val DRIVE_ANDROID_SDK_THUMBNAIL_PHOTO = "DriveAndroidSDKThumbnailPhoto"
         const val DRIVE_ANDROID_SDK_NODE_OPERATION = "DriveAndroidSDKNodeOperation"
+        const val DRIVE_ANDROID_SDK_TRASH = "DriveAndroidSDKTrash"
         const val DRIVE_ANDROID_UPLOAD_FOLDER = "DriveAndroidUploadFolder"
         const val DRIVE_ANDROID_PHOTO_LISTING_WITH_FILE_PROPERTIES = "DriveAndroidPhotoListingWithFileProperties"
         const val DRIVE_ANDROID_DOCUMENT_SCANNER = "DriveAndroidDocumentScanner"
         const val DRIVE_DOWNLOAD_VERIFICATION_DISABLED = "DriveDownloadVerificationDisabled"
         const val DRIVE_UPLOAD_VERIFICATION_DISABLED = "DriveUploadVerificationDisabled"
         const val DRIVE_ANDROID_SPRING_SALE_2026 = "DriveAndroidSpringSale2026"
+        const val DRIVE_ANDROID_DOWNLOAD_FILE_PROGRESS_NOTIFICATION_DISABLED = "DriveAndroidDownloadFileProgressNotificationDisabled"
 
         internal var developments : List<String> = listOf(
         )
@@ -87,11 +89,13 @@ sealed class FeatureFlagId(open val userId: UserId, open val id: String) {
         fun driveAndroidSDKThumbnailMain(userId: UserId) = Unleash(userId, DRIVE_ANDROID_SDK_THUMBNAIL_MAIN)
         fun driveAndroidSDKThumbnailPhoto(userId: UserId) = Unleash(userId, DRIVE_ANDROID_SDK_THUMBNAIL_PHOTO)
         fun driveAndroidSDKNodeOperation(userId: UserId) = Unleash(userId, DRIVE_ANDROID_SDK_NODE_OPERATION)
+        fun driveAndroidSDKTrash(userId: UserId) = Unleash(userId, DRIVE_ANDROID_SDK_TRASH)
         fun driveAndroidUploadFolder(userId: UserId) = Unleash(userId, DRIVE_ANDROID_UPLOAD_FOLDER)
         fun driveAndroidPhotoListingWithFileProperties(userId: UserId) = Unleash(userId, DRIVE_ANDROID_PHOTO_LISTING_WITH_FILE_PROPERTIES)
         fun driveAndroidDocumentScanner(userId: UserId) = Unleash(userId, DRIVE_ANDROID_DOCUMENT_SCANNER)
         fun driveDownloadVerificationDisabled(userId: UserId) = Unleash(userId, DRIVE_DOWNLOAD_VERIFICATION_DISABLED)
         fun driveUploadVerificationDisabled(userId: UserId) = Unleash(userId, DRIVE_UPLOAD_VERIFICATION_DISABLED)
         fun driveAndroidSpringSale2026(userId: UserId) = Unleash(userId, DRIVE_ANDROID_SPRING_SALE_2026)
+        fun driveAndroidDownloadFileProgressNotificationDisabled(userId: UserId) = Unleash(userId, DRIVE_ANDROID_DOWNLOAD_FILE_PROGRESS_NOTIFICATION_DISABLED)
     }
 }
diff --git a/drive/file-info/build.gradle.kts b/drive/file-info/build.gradle.kts
index 81f2090b..26fb9df8 100644
--- a/drive/file-info/build.gradle.kts
+++ b/drive/file-info/build.gradle.kts
@@ -26,7 +26,6 @@ android {
 driveModule(
     compose = true,
     i18n = true,
-    kapt = true,
     showkase = true,
     buildConfig = true,
 ) {
diff --git a/drive/file/base/data/src/main/kotlin/me/proton/core/drive/file/base/data/api/entity/RevisionDto.kt b/drive/file/base/data/src/main/kotlin/me/proton/core/drive/file/base/data/api/entity/RevisionDto.kt
index 723eee87..a3858c0a 100644
--- a/drive/file/base/data/src/main/kotlin/me/proton/core/drive/file/base/data/api/entity/RevisionDto.kt
+++ b/drive/file/base/data/src/main/kotlin/me/proton/core/drive/file/base/data/api/entity/RevisionDto.kt
@@ -20,6 +20,7 @@ package me.proton.core.drive.file.base.data.api.entity
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import me.proton.core.drive.base.data.api.Dto.BLOCKS
+import me.proton.core.drive.base.data.api.Dto.CHECKSUM_VERIFIED
 import me.proton.core.drive.base.data.api.Dto.CREATE_TIME
 import me.proton.core.drive.base.data.api.Dto.ID
 import me.proton.core.drive.base.data.api.Dto.MANIFEST_SIGNATURE
@@ -53,6 +54,8 @@ data class RevisionDto(
     val thumbnailHash: String?,
     @SerialName(THUMBNAIL_SIZE)
     val thumbnailSize: Long,
+    @SerialName(CHECKSUM_VERIFIED)
+    val checksumVerified: Boolean,
     @SerialName(BLOCKS)
     val blocks: List<BlockDto>
 )
diff --git a/drive/file/base/data/src/main/kotlin/me/proton/core/drive/file/base/data/extension/RevisionDto.kt b/drive/file/base/data/src/main/kotlin/me/proton/core/drive/file/base/data/extension/RevisionDto.kt
index f1e45d7f..8b697a13 100644
--- a/drive/file/base/data/src/main/kotlin/me/proton/core/drive/file/base/data/extension/RevisionDto.kt
+++ b/drive/file/base/data/src/main/kotlin/me/proton/core/drive/file/base/data/extension/RevisionDto.kt
@@ -29,7 +29,8 @@ fun RevisionDto.toRevisionInfo() =
         blocks = blocks.map { blockDto -> blockDto.toBlock() },
         manifestSignature = manifestSignature,
         signatureAddress = signatureAddress,
-        state = state.toRevisionState()
+        state = state.toRevisionState(),
+        checksumVerified = checksumVerified,
     )
 
 private fun Long.toRevisionState(): RevisionState? {
diff --git a/drive/file/base/domain/src/main/kotlin/me/proton/core/drive/file/base/domain/entity/Revision.kt b/drive/file/base/domain/src/main/kotlin/me/proton/core/drive/file/base/domain/entity/Revision.kt
index 0d69ad5d..98f1ee8d 100644
--- a/drive/file/base/domain/src/main/kotlin/me/proton/core/drive/file/base/domain/entity/Revision.kt
+++ b/drive/file/base/domain/src/main/kotlin/me/proton/core/drive/file/base/domain/entity/Revision.kt
@@ -25,6 +25,7 @@ data class Revision(
     val manifestSignature: String?,
     val signatureAddress: String?,
     val state: RevisionState? = null,
+    val checksumVerified: Boolean = false,
 ) {
     val fileSize: Long = revisionSize - thumbnailSize
 }
diff --git a/drive/files/data/src/main/kotlin/me/proton/core/drive/files/data/operation/move/worker/MoveFileWorker.kt b/drive/files/data/src/main/kotlin/me/proton/core/drive/files/data/operation/move/worker/MoveFileWorker.kt
index 7c68822d..a11cb64f 100644
--- a/drive/files/data/src/main/kotlin/me/proton/core/drive/files/data/operation/move/worker/MoveFileWorker.kt
+++ b/drive/files/data/src/main/kotlin/me/proton/core/drive/files/data/operation/move/worker/MoveFileWorker.kt
@@ -40,7 +40,7 @@ import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.data.workmanager.addTags
 import me.proton.core.drive.base.domain.api.ProtonApiCode
 import me.proton.core.drive.base.domain.extension.onProtonHttpException
-import me.proton.core.drive.base.domain.extension.resultValueOrNull
+import me.proton.core.drive.base.domain.extension.toResult
 import me.proton.core.drive.base.domain.log.LogTag
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.drivelink.domain.entity.DriveLink
@@ -81,14 +81,18 @@ class MoveFileWorker @AssistedInject constructor(
 
     override suspend fun doWork(): Result = supervisorScope {
         val driveLinks = getSelectedDriveLinks(selectionId).first()
-        val parentId = getLink(moveToParentId).resultValueOrNull()?.id
+        val parentId = getLink(moveToParentId).toResult().onFailure { error ->
+            error.log(LogTag.MOVE, "Cannot get link to move file: $moveToParentId")
+        }.getOrNull()?.id
         if (driveLinks.isEmpty() || parentId == null || parentId !is ParentId) {
             broadcastMessages(
                 userId = userId,
                 message = applicationContext.getString(I18N.string.file_operation_error_occurred_moving_file),
                 type = BroadcastMessage.Type.ERROR
             )
-            deselectLinks(selectionId)
+            deselectLinks(selectionId).onFailure { error ->
+                error.log(LogTag.MOVE, "Failed to deselect links")
+            }
             return@supervisorScope Result.failure()
         }
         val succeeded: MutableList<DriveLink> = Collections.synchronizedList(arrayListOf())
@@ -135,7 +139,9 @@ class MoveFileWorker @AssistedInject constructor(
             CoreLogger.d(LogTag.MOVE, e, e.message.orEmpty())
             cancel()
         }
-        deselectLinks(selectionId)
+        deselectLinks(selectionId).onFailure { error ->
+            error.log(LogTag.MOVE, "Failed to deselect links")
+        }
         return@supervisorScope Result.success()
     }
 
diff --git a/drive/files/domain/src/main/kotlin/me/proton/core/drive/files/domain/operation/FileOperationActionProvider.kt b/drive/files/domain/src/main/kotlin/me/proton/core/drive/files/domain/operation/FileOperationActionProvider.kt
index f9b1c979..981e84ae 100644
--- a/drive/files/domain/src/main/kotlin/me/proton/core/drive/files/domain/operation/FileOperationActionProvider.kt
+++ b/drive/files/domain/src/main/kotlin/me/proton/core/drive/files/domain/operation/FileOperationActionProvider.kt
@@ -18,6 +18,8 @@
 
 package me.proton.core.drive.files.domain.operation
 
+import me.proton.core.drive.base.domain.log.LogTag
+import me.proton.core.drive.base.domain.usecase.ReportError
 import me.proton.core.drive.files.domain.operation.notification.MoveFileExtra
 import me.proton.core.drive.files.domain.usecase.MoveFile
 import me.proton.core.drive.messagequeue.domain.ActionProvider
@@ -27,6 +29,7 @@ import me.proton.core.drive.i18n.R as I18N
 
 class FileOperationActionProvider @Inject constructor(
     private val moveFile: MoveFile,
+    private val reportError: ReportError
 ) : ActionProvider {
 
     override fun provideAction(extra: Serializable?): ActionProvider.Action? =
@@ -38,7 +41,9 @@ class FileOperationActionProvider @Inject constructor(
 
     private fun MoveFileExtra.provideAction(): ActionProvider.Action? = if (exception != null) {
         ActionProvider.Action(I18N.string.files_operation_retry_action) {
-            moveFile(userId, links.map { pair -> pair.second }, parentId)
+            moveFile(userId, links.map { pair -> pair.second }, parentId).onFailure { error ->
+                reportError(LogTag.MOVE, "Failed to move file to ${parentId.id}")
+            }
         }
     } else if (allowUndo) {
         ActionProvider.Action(I18N.string.files_operation_undo_action) {
@@ -50,7 +55,9 @@ class FileOperationActionProvider @Inject constructor(
                         linkIds = children[originalParentId]!!.map { pair -> pair.second },
                         parentId = originalParentId,
                         allowUndo = false,
-                    )
+                    ).onFailure { error ->
+                        reportError(LogTag.MOVE, "Failed to move file to ${originalParentId.id}")
+                    }
                 }
             }
         }
diff --git a/drive/files/domain/src/main/kotlin/me/proton/core/drive/files/domain/usecase/MoveFile.kt b/drive/files/domain/src/main/kotlin/me/proton/core/drive/files/domain/usecase/MoveFile.kt
index dcfa6dab..8b3e9584 100644
--- a/drive/files/domain/src/main/kotlin/me/proton/core/drive/files/domain/usecase/MoveFile.kt
+++ b/drive/files/domain/src/main/kotlin/me/proton/core/drive/files/domain/usecase/MoveFile.kt
@@ -19,6 +19,7 @@
 package me.proton.core.drive.files.domain.usecase
 
 import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.files.domain.operation.FileOperationManager
 import me.proton.core.drive.link.domain.entity.LinkId
 import me.proton.core.drive.link.domain.entity.ParentId
@@ -27,7 +28,12 @@ import javax.inject.Inject
 class MoveFile @Inject constructor(
     private val fileOperationManager: FileOperationManager
 ) {
-    suspend operator fun invoke(userId: UserId, linkIds: List<LinkId>, parentId: ParentId, allowUndo: Boolean = true) {
+    suspend operator fun invoke(
+        userId: UserId,
+        linkIds: List<LinkId>,
+        parentId: ParentId,
+        allowUndo: Boolean = true,
+    ) = coRunCatching {
         fileOperationManager.changeParent(userId, linkIds, parentId, allowUndo)
     }
 }
diff --git a/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/component/Files.kt b/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/component/Files.kt
index baa9c820..f6f27009 100644
--- a/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/component/Files.kt
+++ b/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/component/Files.kt
@@ -128,6 +128,7 @@ fun TopAppBar(
         navigationIcon = if (viewState.navigationIconResId != 0) {
             painterResource(id = viewState.navigationIconResId)
         } else null,
+        navigationContentDescription = viewState.navigationContentDescription,
         notificationDotVisible = viewState.notificationDotVisible,
         onNavigationIcon = viewEvent.onTopAppBarNavigation,
         title = viewState.title ?: stringResource(id = viewState.titleResId),
diff --git a/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/component/files/FilesGridItem.kt b/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/component/files/FilesGridItem.kt
index aa7601fd..1449cd71 100644
--- a/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/component/files/FilesGridItem.kt
+++ b/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/component/files/FilesGridItem.kt
@@ -54,6 +54,7 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -76,6 +77,7 @@ import me.proton.core.drive.drivelink.domain.extension.isNameEncrypted
 import me.proton.core.drive.files.presentation.component.FilesTestTag
 import me.proton.core.drive.linkdownload.domain.entity.DownloadState
 import me.proton.core.drive.thumbnail.presentation.extension.thumbnailPainter
+import me.proton.core.drive.i18n.R as I18N
 import me.proton.core.presentation.R as CorePresentation
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -261,7 +263,7 @@ private fun GridItemMoreButton(
                         .size(SmallIconSize)
                         .align(Alignment.Center),
                     painter = painterResource(id = CorePresentation.drawable.ic_proton_three_dots_vertical),
-                    contentDescription = null,
+                    contentDescription = stringResource(I18N.string.common_more),
                     tint = ProtonTheme.colors.interactionStrongNorm
                 )
             }
diff --git a/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/component/files/FilesListItem.kt b/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/component/files/FilesListItem.kt
index 079b4952..6ac7227b 100644
--- a/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/component/files/FilesListItem.kt
+++ b/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/component/files/FilesListItem.kt
@@ -368,7 +368,7 @@ fun OfflineIcon(
             modifier = modifier.size(ExtraSmallIconSize).testTag(FilesTestTag.offlineIconDownloaded),
             painter = painterResource(id = BasePresentation.drawable.ic_status_downloaded),
             tint = ProtonTheme.colors.iconWeak,
-            contentDescription = null
+            contentDescription = stringResource(I18N.string.common_downloaded)
         )
         is DownloadState.Downloading -> CircularProgressIndicator(
             modifier = modifier.size(ExtraSmallIconSize).testTag(FilesTestTag.offlineDownloding),
@@ -378,7 +378,7 @@ fun OfflineIcon(
             modifier = modifier.size(ExtraSmallIconSize).testTag(FilesTestTag.offlineIconWaiting),
             painter = painterResource(id = BasePresentation.drawable.ic_status_waiting_for_download),
             tint = ProtonTheme.colors.iconWeak,
-            contentDescription = null
+            contentDescription = stringResource(I18N.string.common_waiting_for_download)
         )
     }
 }
@@ -486,7 +486,7 @@ fun MoreOptions(
     ) {
         Icon(
             painter = painterResource(id = CorePresentation.drawable.ic_proton_three_dots_vertical),
-            contentDescription = null,
+            contentDescription = stringResource(I18N.string.common_more),
             tint = ProtonTheme.colors.interactionStrongNorm
         )
     }
diff --git a/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/state/FilesViewState.kt b/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/state/FilesViewState.kt
index dfe77589..f7f2d126 100644
--- a/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/state/FilesViewState.kt
+++ b/drive/files/presentation/src/main/kotlin/me/proton/core/drive/files/presentation/state/FilesViewState.kt
@@ -38,6 +38,7 @@ data class FilesViewState(
     val isTitleEncrypted: Boolean = false,
     val sorting: Sorting,
     @DrawableRes val navigationIconResId: Int,
+    val navigationContentDescription: String?,
     val drawerGesturesEnabled: Boolean,
     val listContentState: ListContentState,
     val listContentAppendingState: ListContentAppendingState,
diff --git a/drive/folder-create/domain/src/main/kotlin/me/proton/core/drive/folder/create/domain/usecase/CreateFolder.kt b/drive/folder-create/domain/src/main/kotlin/me/proton/core/drive/folder/create/domain/usecase/CreateFolder.kt
index 9313994e..6903c2a4 100644
--- a/drive/folder-create/domain/src/main/kotlin/me/proton/core/drive/folder/create/domain/usecase/CreateFolder.kt
+++ b/drive/folder-create/domain/src/main/kotlin/me/proton/core/drive/folder/create/domain/usecase/CreateFolder.kt
@@ -22,7 +22,7 @@ import me.proton.core.drive.base.domain.extension.toResult
 import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.link.domain.entity.FolderId
 import me.proton.core.drive.link.domain.entity.Link
-import me.proton.core.drive.link.domain.extension.id
+import me.proton.core.drive.link.domain.extension.linkId
 import me.proton.core.drive.link.domain.extension.nodeUid
 import me.proton.core.drive.link.domain.extension.userId
 import me.proton.core.drive.link.domain.usecase.GetLink
@@ -50,7 +50,7 @@ class CreateFolder @Inject constructor(
                 folderName = folderName,
                 shouldUpdateEvent = shouldUpdateEvent,
             ).getOrThrow().let { (name, folderNode) ->
-                name to folderNode.id(parentFolder.id.shareId)
+                name to folderNode.linkId(parentFolder.id.shareId)
             }
         } else {
             createFolderLegacy(
diff --git a/drive/folder-create/domain/src/main/kotlin/me/proton/core/drive/folder/create/domain/usecase/CreateFolderSdk.kt b/drive/folder-create/domain/src/main/kotlin/me/proton/core/drive/folder/create/domain/usecase/CreateFolderSdk.kt
index b28d22e0..785fbd1b 100644
--- a/drive/folder-create/domain/src/main/kotlin/me/proton/core/drive/folder/create/domain/usecase/CreateFolderSdk.kt
+++ b/drive/folder-create/domain/src/main/kotlin/me/proton/core/drive/folder/create/domain/usecase/CreateFolderSdk.kt
@@ -24,6 +24,7 @@ import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.eventmanager.base.domain.usecase.UpdateEventAction
 import me.proton.core.drive.link.domain.usecase.ValidateLinkName
 import me.proton.drive.sdk.entity.FolderNode
+import me.proton.drive.sdk.entity.NodeUid
 import javax.inject.Inject
 
 class CreateFolderSdk @Inject constructor(
@@ -33,7 +34,7 @@ class CreateFolderSdk @Inject constructor(
 ) {
     suspend operator fun invoke(
         userId: UserId,
-        parentFolderUid: String,
+        parentFolderUid: NodeUid,
         folderName: String,
         shouldUpdateEvent: Boolean = true,
     ): Result<Pair<String, FolderNode>> = coRunCatching {
diff --git a/drive/i18n/src/main/res/values-b+es+419/app.xml b/drive/i18n/src/main/res/values-b+es+419/app.xml
index c9fcce56..71306801 100644
--- a/drive/i18n/src/main/res/values-b+es+419/app.xml
+++ b/drive/i18n/src/main/res/values-b+es+419/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">La copia de seguridad no puede ejecutarse en segundo plano</string>
   <string name="notification_content_text_backup_preparing">Preparando para hacer copia de seguridad</string>
   <string name="notification_content_text_backup_failed_migration">Migración en progreso. Actualice su aplicación.</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Descargando %1$d archivo</item>
+    <item quantity="other">Descargando %1$d archivos</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Descarga completada</string>
   <string name="notification_content_title_forced_sign_out">Inicie sesión</string>
   <string name="notification_content_text_forced_sign_out">Lamentamos la interrupción. Tuvimos un problema con la sincronización. Inicie sesión de nuevo y todo funcionará sin problemas.</string>
diff --git a/drive/i18n/src/main/res/values-be/app.xml b/drive/i18n/src/main/res/values-be/app.xml
index 91c3b580..3345f7a1 100644
--- a/drive/i18n/src/main/res/values-be/app.xml
+++ b/drive/i18n/src/main/res/values-be/app.xml
@@ -158,6 +158,18 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Рэзервовае капіяванне не можа выконвацца ў фоне</string>
   <string name="notification_content_text_backup_preparing">Падрыхтоўка да рэзервовай копіі</string>
   <string name="notification_content_text_backup_failed_migration">Адбываецца перанос. Абнаўленне праграмы</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Спампоўванне %1$d файла</item>
+    <item quantity="few">Спампоўванне %1$d файлаў</item>
+    <item quantity="many">Спампоўванне %1$d файлаў</item>
+    <item quantity="other">Спампоўванне %1$d файлаў</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Спампоўванне завершана</string>
   <string name="notification_content_title_forced_sign_out">Увайдзіце</string>
   <string name="notification_content_text_forced_sign_out">Прабачце за нязручнасці! Адбылася праблема з сінхранізацыяй. Увайдзіце яшчэ раз і працэс адновіцца ў звычайным рэжыме.</string>
diff --git a/drive/i18n/src/main/res/values-ca/app.xml b/drive/i18n/src/main/res/values-ca/app.xml
index 878d7d4a..8ac93940 100644
--- a/drive/i18n/src/main/res/values-ca/app.xml
+++ b/drive/i18n/src/main/res/values-ca/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">La còpia de seguretat no es pot executar en segon pla</string>
   <string name="notification_content_text_backup_preparing">S\'està preparant per a fer una còpia de seguretat</string>
   <string name="notification_content_text_backup_failed_migration">La migració està en curs. Actualitzeu l\'aplicació.</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">S\'està descarregant %1$d fitxer</item>
+    <item quantity="other">S\'estan descarregant %1$d fitxers</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Descàrrega completa</string>
   <string name="notification_content_title_forced_sign_out">Inicieu la sessió</string>
   <string name="notification_content_text_forced_sign_out">Hi ha hagut un problema amb la sincronització. Torneu a iniciar la sessió i tot funcionarà sense problemes.</string>
diff --git a/drive/i18n/src/main/res/values-ca/common.xml b/drive/i18n/src/main/res/values-ca/common.xml
index e08fdff5..7bfcee69 100644
--- a/drive/i18n/src/main/res/values-ca/common.xml
+++ b/drive/i18n/src/main/res/values-ca/common.xml
@@ -78,7 +78,7 @@
   <string name="common_add_to_albums_action">Afegeix als àlbums</string>
   <string name="common_tag_photo_action">Escanegeu la foto per etiquetes</string>
   <string name="common_save_as_action">Desa com</string>
-  <string name="common_open_action">Obrir</string>
+  <string name="common_open_action">Obre</string>
   <!-- endregion -->
   <!-- region Common file types -->
   <string name="common_type_audio">Àudio</string>
diff --git a/drive/i18n/src/main/res/values-cs/app.xml b/drive/i18n/src/main/res/values-cs/app.xml
index c41a29e3..cb615e05 100644
--- a/drive/i18n/src/main/res/values-cs/app.xml
+++ b/drive/i18n/src/main/res/values-cs/app.xml
@@ -158,6 +158,18 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Zálohování nemůže probíhat na pozadí</string>
   <string name="notification_content_text_backup_preparing">Příprava zálohování</string>
   <string name="notification_content_text_backup_failed_migration">Probíhá migrace, aktualizujte svou aplikaci</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Downloading %1$d file</item>
+    <item quantity="few">Downloading %1$d files</item>
+    <item quantity="many">Downloading %1$d files</item>
+    <item quantity="other">Downloading %1$d files</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Stahování dokončeno</string>
   <string name="notification_content_title_forced_sign_out">Přihlaste se, prosím</string>
   <string name="notification_content_text_forced_sign_out">Omlouváme se za vyrušení! Nastal problém se synchronizací - prosím přihlaste se znovu a vše bude fungovat bez problémů.</string>
diff --git a/drive/i18n/src/main/res/values-da/app.xml b/drive/i18n/src/main/res/values-da/app.xml
index ed0260c2..e77c4122 100644
--- a/drive/i18n/src/main/res/values-da/app.xml
+++ b/drive/i18n/src/main/res/values-da/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Sikkerhedskopiering kan ikke køre i baggrunden</string>
   <string name="notification_content_text_backup_preparing">Klargøring til sikkerhedskopiering</string>
   <string name="notification_content_text_backup_failed_migration">Migration i gang, opdater din applikation</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Downloader %1$d fil</item>
+    <item quantity="other">Downloader %1$d filer</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Download fuldført</string>
   <string name="notification_content_title_forced_sign_out">Log ind</string>
   <string name="notification_content_text_forced_sign_out">Beklager afbrydelsen! Vi havde et problem med synkroniseringen - log venligst ind igen, så skal vi nok få det hele til at køre som smurt.</string>
diff --git a/drive/i18n/src/main/res/values-de/app.xml b/drive/i18n/src/main/res/values-de/app.xml
index c5937a90..e97776ba 100644
--- a/drive/i18n/src/main/res/values-de/app.xml
+++ b/drive/i18n/src/main/res/values-de/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Sicherung kann nicht im Hintergrund laufen</string>
   <string name="notification_content_text_backup_preparing">Sicherung wird vorbereitet</string>
   <string name="notification_content_text_backup_failed_migration">Übernahme im Gange, aktualisiere deine Anwendung</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">%1$d Datei wird heruntergeladen</item>
+    <item quantity="other">%1$d Dateien werden heruntergeladen</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Download abgeschlossen</string>
   <string name="notification_content_title_forced_sign_out">Bitte melde dich an</string>
   <string name="notification_content_text_forced_sign_out">Entschuldigung für die Unterbrechung! Wir hatten ein Problem mit der Synchronisierung - bitte logge dich erneut ein, damit alles reibungslos funktioniert.</string>
diff --git a/drive/i18n/src/main/res/values-el/app.xml b/drive/i18n/src/main/res/values-el/app.xml
index e03a9470..d3e54bd0 100644
--- a/drive/i18n/src/main/res/values-el/app.xml
+++ b/drive/i18n/src/main/res/values-el/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Δεν είναι δυνατή η εκτέλεση της δημιουργίας αντιγράφων ασφαλείας στο παρασκήνιο</string>
   <string name="notification_content_text_backup_preparing">Προετοιμασία δημιουργίας αντιγράφων ασφαλείας</string>
   <string name="notification_content_text_backup_failed_migration">Μετεγκατάσταση σε εξέλιξη, ενημερώστε την εφαρμογή σας</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Λήψη %1$d φακέλου</item>
+    <item quantity="other">Λήψη %1$d φακέλων</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Η λήψη ολοκληρώθηκε</string>
   <string name="notification_content_title_forced_sign_out">Παρακαλούμε συνδεθείτε</string>
   <string name="notification_content_text_forced_sign_out">Συγνώμη για τη διακοπή! Αντιμετωπίσαμε πρόβλημα με το συγχρονισμό - συνδεθείτε ξανά και θα λειτουργήσουν όλα ομαλά.</string>
diff --git a/drive/i18n/src/main/res/values-es-rES/app.xml b/drive/i18n/src/main/res/values-es-rES/app.xml
index 459fadf6..9f99beb7 100644
--- a/drive/i18n/src/main/res/values-es-rES/app.xml
+++ b/drive/i18n/src/main/res/values-es-rES/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">La copia de seguridad no puede ejecutarse en segundo plano.</string>
   <string name="notification_content_text_backup_preparing">Preparando a hacer una copia de seguridad</string>
   <string name="notification_content_text_backup_failed_migration">Migración en progreso. Actualiza tu aplicación.</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Descargando %1$d archivo</item>
+    <item quantity="other">Descargando %1$d archivos</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Descarga completada</string>
   <string name="notification_content_title_forced_sign_out">Inicia sesión</string>
   <string name="notification_content_text_forced_sign_out">Lamentamos la interrupción. Hemos tenido un problema con la sincronización. Inicia sesión de nuevo y todo funcionará sin problemas.</string>
diff --git a/drive/i18n/src/main/res/values-fi/app.xml b/drive/i18n/src/main/res/values-fi/app.xml
index 02063787..77478399 100644
--- a/drive/i18n/src/main/res/values-fi/app.xml
+++ b/drive/i18n/src/main/res/values-fi/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Varmuuskopiointia ei voida suorittaa taustalla</string>
   <string name="notification_content_text_backup_preparing">Valmistellaan varmuuskopiointia</string>
   <string name="notification_content_text_backup_failed_migration">Siirto käynnissä, päivitä sovelluksesi</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Ladataan %1$d tiedosto</item>
+    <item quantity="other">Ladataan %1$d tiedostoa</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Lataus on valmis</string>
   <string name="notification_content_title_forced_sign_out">Kirjaudu sisään</string>
   <string name="notification_content_text_forced_sign_out">Pahoittelut keskeytyksestä! Synkronoitaessa kohdattiin ongelma - kirjaudu sisään uudelleen, niin kaikki sujuu taas hyvin.</string>
diff --git a/drive/i18n/src/main/res/values-fr/app.xml b/drive/i18n/src/main/res/values-fr/app.xml
index 84b3e453..1471c611 100644
--- a/drive/i18n/src/main/res/values-fr/app.xml
+++ b/drive/i18n/src/main/res/values-fr/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">La sauvegarde ne peut pas être exécutée en arrière-plan.</string>
   <string name="notification_content_text_backup_preparing">Préparation de la sauvegarde</string>
   <string name="notification_content_text_backup_failed_migration">Migration en cours. Mettez à jour votre application</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">%1$d fichier en cours de téléchargement...</item>
+    <item quantity="other">%1$d fichiers en cours de téléchargement...</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Le téléchargement est terminé.</string>
   <string name="notification_content_title_forced_sign_out">Connectez-vous</string>
   <string name="notification_content_text_forced_sign_out">Nous sommes désolés de vous interrompre, mais nous avons eu un problème de synchronisation. Nous vous invitons à vous reconnecter, nous ferons en sorte que tout se passe bien.</string>
diff --git a/drive/i18n/src/main/res/values-hu/app.xml b/drive/i18n/src/main/res/values-hu/app.xml
index fed64e4a..92fd478a 100644
--- a/drive/i18n/src/main/res/values-hu/app.xml
+++ b/drive/i18n/src/main/res/values-hu/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">A biztonsági mentés nem fut a háttérben</string>
   <string name="notification_content_text_backup_preparing">Felkészülés a biztonsági mentésre</string>
   <string name="notification_content_text_backup_failed_migration">Folyamatban van az áthelyezés, frissítse az alkalmazást</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Downloading %1$d file</item>
+    <item quantity="other">Downloading %1$d files</item>
+  </plurals>
   <string name="notification_content_title_download_complete">A letöltés befejeződött</string>
   <string name="notification_content_title_forced_sign_out">Jelentkezzen be</string>
   <string name="notification_content_text_forced_sign_out">Sajnos hiba történt a szinkronizálás közben - lépjen be újra, hogy minden ismét gördülékenyen működhessen.</string>
diff --git a/drive/i18n/src/main/res/values-id/app.xml b/drive/i18n/src/main/res/values-id/app.xml
index 5d161eca..cbfcdb53 100644
--- a/drive/i18n/src/main/res/values-id/app.xml
+++ b/drive/i18n/src/main/res/values-id/app.xml
@@ -143,6 +143,15 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Pencadangan tidak dapat berlangsung di belakang layar</string>
   <string name="notification_content_text_backup_preparing">Mempersiapkan pencadangan</string>
   <string name="notification_content_text_backup_failed_migration">Migrasi sedang berlangsung, perbarui aplikasi Anda</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="other">Downloading %1$d files</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Unduhan selesai</string>
   <string name="notification_content_title_forced_sign_out">Silakan masuk</string>
   <string name="notification_content_text_forced_sign_out">Maaf mengganggu! Kami mengalami masalah dengan sinkronisasi — silakan masuk lagi dan semuanya akan berjalan dengan lancar.</string>
diff --git a/drive/i18n/src/main/res/values-it/app.xml b/drive/i18n/src/main/res/values-it/app.xml
index 65b21dad..c5c9381c 100644
--- a/drive/i18n/src/main/res/values-it/app.xml
+++ b/drive/i18n/src/main/res/values-it/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Il backup non può essere effettuato in background</string>
   <string name="notification_content_text_backup_preparing">Preparazione del backup in corso</string>
   <string name="notification_content_text_backup_failed_migration">Migrazione in corso, aggiorna la tua applicazione</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Scaricamento di %1$d file</item>
+    <item quantity="other">Scaricamento di %1$d file</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Download completato</string>
   <string name="notification_content_title_forced_sign_out">Effettua l\'accesso</string>
   <string name="notification_content_text_forced_sign_out">Scusa l\'interruzione! Abbiamo avuto un problema con la sincronizzazione. Effettua nuovamente l\'accesso e faremo andare tutto liscio.</string>
diff --git a/drive/i18n/src/main/res/values-ja/app.xml b/drive/i18n/src/main/res/values-ja/app.xml
index 65d46012..5bf1005a 100644
--- a/drive/i18n/src/main/res/values-ja/app.xml
+++ b/drive/i18n/src/main/res/values-ja/app.xml
@@ -48,7 +48,7 @@
   <string name="folder_option_create_document">ドキュメントを作成</string>
   <string name="folder_option_create_spreadsheet">スプレッドシートを作成</string>
   <string name="folder_option_import_folder">フォルダをアップロードする</string>
-  <string name="folder_option_scan_document">Scan document</string>
+  <string name="folder_option_scan_document">書類をスキャン</string>
   <string name="settings_theme_system_default">システム標準</string>
   <string name="settings_theme_dark">ダーク</string>
   <string name="settings_theme_light">ライト</string>
@@ -143,6 +143,15 @@
   <string name="notification_content_text_backup_paused_background_restrictions">バックアップはバックグラウンドで実行できません</string>
   <string name="notification_content_text_backup_preparing">バックアップを準備中</string>
   <string name="notification_content_text_backup_failed_migration">移行中です。アプリを更新してください</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="other">%1$d 個のファイルをダウンロード中</item>
+  </plurals>
   <string name="notification_content_title_download_complete">ダウンロード完了</string>
   <string name="notification_content_title_forced_sign_out">ログインしてください</string>
   <string name="notification_content_text_forced_sign_out">申し訳ありません！同期中に問題が発生しました。- もう一度ログインしてください。すべてがスムーズに実行されます。</string>
@@ -193,7 +202,7 @@
   <string name="operation_open_document">ドキュメントを開く</string>
   <string name="operation_create_document">ドキュメントの作成</string>
   <string name="operation_take_picture">写真を撮らせて</string>
-  <string name="operation_scan_document">scan a document</string>
+  <string name="operation_scan_document">書類をスキャン</string>
   <!-- region Get more free storage -->
   <!--
         Variable %1$s is a quantity (formatted) of max free storage
diff --git a/drive/i18n/src/main/res/values-ja/common.xml b/drive/i18n/src/main/res/values-ja/common.xml
index d532209f..82d5ac23 100644
--- a/drive/i18n/src/main/res/values-ja/common.xml
+++ b/drive/i18n/src/main/res/values-ja/common.xml
@@ -41,7 +41,7 @@
   <string name="common_all">すべて</string>
   <string name="common_unknown">不明</string>
   <string name="common_month">1ヶ月</string>
-  <string name="common_year">Year</string>
+  <string name="common_year">年</string>
   <!-- endregion -->
   <!-- region Common actions -->
   <string name="common_ok_action">OK</string>
@@ -77,8 +77,8 @@
   <string name="common_save_all_action">すべて保存</string>
   <string name="common_add_to_albums_action">アルバムに追加</string>
   <string name="common_tag_photo_action">写真のタグをスキャン</string>
-  <string name="common_save_as_action">Save as</string>
-  <string name="common_open_action">Open</string>
+  <string name="common_save_as_action">として保存</string>
+  <string name="common_open_action">開く</string>
   <!-- endregion -->
   <!-- region Common file types -->
   <string name="common_type_audio">音声</string>
diff --git a/drive/i18n/src/main/res/values-ja/document_scanner.xml b/drive/i18n/src/main/res/values-ja/document_scanner.xml
index 04054589..f8ed3bf9 100644
--- a/drive/i18n/src/main/res/values-ja/document_scanner.xml
+++ b/drive/i18n/src/main/res/values-ja/document_scanner.xml
@@ -17,9 +17,9 @@
   ~ along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
   -->
 <resources>
-  <string name="scan_document_name_title">Name your scan</string>
+  <string name="scan_document_name_title">スキャンに名前を付ける</string>
   <string name="scan_document_name_output_format_pdf_title">PDF</string>
-  <string name="scan_document_name_output_format_pdf_description">All pages are saved into single document</string>
+  <string name="scan_document_name_output_format_pdf_description">全てのページは一つの書類に保存されます</string>
   <string name="scan_document_name_output_format_jpeg_title">JPEG</string>
-  <string name="scan_document_name_output_format_jpeg_description">Every page is saved as separate image</string>
+  <string name="scan_document_name_output_format_jpeg_description">すべてのページは別々の画像として保存されます</string>
 </resources>
diff --git a/drive/i18n/src/main/res/values-ja/photos.xml b/drive/i18n/src/main/res/values-ja/photos.xml
index d26d252c..53cd873f 100644
--- a/drive/i18n/src/main/res/values-ja/photos.xml
+++ b/drive/i18n/src/main/res/values-ja/photos.xml
@@ -61,7 +61,7 @@
   <string name="photos_error_no_folders">バックアップ用の %1$s フォルダーが見つかりません</string>
   <string name="photos_error_backup_disabled">バックアップが無効になりました。</string>
   <string name="photos_error_backup_disabled_action">オンにする</string>
-  <string name="photos_error_backup_missing_folder">Default camera folder not found</string>
+  <string name="photos_error_backup_missing_folder">デフォルトのカメラフォルダが見つかりません</string>
   <string name="photos_error_backup_failed">バックアップに失敗しました。</string>
   <string name="photos_error_backup_temporarily_disabled">バックアップは一時的に無効にされています。</string>
   <string name="photos_error_missing_permissions">権限がありません。</string>
@@ -168,6 +168,6 @@
   <plurals name="photos_tags_migration_ongoing">
     <item quantity="other">進行中、%1$s個のファイルが移行中、%2$s個がダウンロード待機中</item>
   </plurals>
-  <string name="photos_folder_selection_title">Backup photos from</string>
-  <string name="photos_folder_selection_description">Select folders to back up and their photos will appear in the Photos tab.</string>
+  <string name="photos_folder_selection_title">写真をバックアップ</string>
+  <string name="photos_folder_selection_description">バックアップするフォルダを選択すると、その写真が「写真」タブに表示されます。</string>
 </resources>
diff --git a/drive/i18n/src/main/res/values-ja/whats_new.xml b/drive/i18n/src/main/res/values-ja/whats_new.xml
index d2049cd9..0855e7d7 100644
--- a/drive/i18n/src/main/res/values-ja/whats_new.xml
+++ b/drive/i18n/src/main/res/values-ja/whats_new.xml
@@ -18,6 +18,6 @@
   -->
 <resources>
   <string name="whats_new_title">最新情報</string>
-  <string name="whats_new_upload_folder_title">Backup entire folders with one tap</string>
-  <string name="whats_new_upload_folder_description">Upload a full folder to Proton Drive by tapping + in the top-right corner and selecting ‘Upload a folder’.</string>
+  <string name="whats_new_upload_folder_title">ワンタップで全てのフォルダをバックアップ</string>
+  <string name="whats_new_upload_folder_description">右上の「＋」をタップし、「フォルダをアップロード」を選択してProton Driveにフォルダ全体をアップロードします。</string>
 </resources>
diff --git a/drive/i18n/src/main/res/values-ka/app.xml b/drive/i18n/src/main/res/values-ka/app.xml
index fb6f46e5..241fa4da 100644
--- a/drive/i18n/src/main/res/values-ka/app.xml
+++ b/drive/i18n/src/main/res/values-ka/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">მარქაფს ფონურად ვერ გაუშვებთ</string>
   <string name="notification_content_text_backup_preparing">მომზადება მარქაფისთვის</string>
   <string name="notification_content_text_backup_failed_migration">მიმდინარეობს მიგრაცია. განაახლეთ თქვენი აპლიკაცია</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">მიმდინარეობს %1$d ფაილის გადმოწერა</item>
+    <item quantity="other">მიმდინარეობს %1$d ფაილის გადმოწერა</item>
+  </plurals>
   <string name="notification_content_title_download_complete">გადმოწერა დასრულებულია</string>
   <string name="notification_content_title_forced_sign_out">საჭიროა ავტორიზაცია</string>
   <string name="notification_content_text_forced_sign_out">უკაცრავად, რომ გაწუხებთ! ჩვენ სინქრონიზაციის შეცდომა გვაქვს - შემოდით თავიდან, ჩვენ ყველაფერი გავასწორეთ.</string>
diff --git a/drive/i18n/src/main/res/values-ko/app.xml b/drive/i18n/src/main/res/values-ko/app.xml
index 36c5fa8b..e42e0ff3 100644
--- a/drive/i18n/src/main/res/values-ko/app.xml
+++ b/drive/i18n/src/main/res/values-ko/app.xml
@@ -143,6 +143,15 @@
   <string name="notification_content_text_backup_paused_background_restrictions">백업이 백그라운드에서 작동할 수 없습니다</string>
   <string name="notification_content_text_backup_preparing">백업 준비 중</string>
   <string name="notification_content_text_backup_failed_migration">전환 진행 중, 애플리케이션을 업데이트하십시오</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="other">Downloading %1$d files</item>
+  </plurals>
   <string name="notification_content_title_download_complete">다운로드 완료</string>
   <string name="notification_content_title_forced_sign_out">로그인해 주세요</string>
   <string name="notification_content_text_forced_sign_out">잠깐 실례합니다! 동기화 중 문제가 있었습니다. 다시 로그인하시면 잘 돌아갈 것입니다.</string>
diff --git a/drive/i18n/src/main/res/values-nb-rNO/app.xml b/drive/i18n/src/main/res/values-nb-rNO/app.xml
index a9c8c4b6..3afb669c 100644
--- a/drive/i18n/src/main/res/values-nb-rNO/app.xml
+++ b/drive/i18n/src/main/res/values-nb-rNO/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Sikkerhetskopiering kan ikke kjøres i bakgrunnen</string>
   <string name="notification_content_text_backup_preparing">Forbereder sikkerhetskopiering</string>
   <string name="notification_content_text_backup_failed_migration">Migrering pågår, oppdater applikasjonen din</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Downloading %1$d file</item>
+    <item quantity="other">Downloading %1$d files</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Nedlasting fullført</string>
   <string name="notification_content_title_forced_sign_out">Logg på</string>
   <string name="notification_content_text_forced_sign_out">Beklager å avbryte! Vi hadde et problem med synkronisering - logg på igjen og vi får alt til å gå på skinner.</string>
diff --git a/drive/i18n/src/main/res/values-nl/app.xml b/drive/i18n/src/main/res/values-nl/app.xml
index 093a7d47..cb30f883 100644
--- a/drive/i18n/src/main/res/values-nl/app.xml
+++ b/drive/i18n/src/main/res/values-nl/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Back-up kan niet op de achtergrond worden uitgevoerd</string>
   <string name="notification_content_text_backup_preparing">Back-up voorbereiden</string>
   <string name="notification_content_text_backup_failed_migration">Migratie in uitvoering, update uw applicatie</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">%1$d bestand downloaden</item>
+    <item quantity="other">%1$d bestanden downloaden</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Download voltooid</string>
   <string name="notification_content_title_forced_sign_out">Inloggen</string>
   <string name="notification_content_text_forced_sign_out">Sorry dat ik stoor! We hadden een probleem met synchroniseren - log opnieuw in en we zullen alles soepel laten verlopen.</string>
diff --git a/drive/i18n/src/main/res/values-pl/app.xml b/drive/i18n/src/main/res/values-pl/app.xml
index df5d1a5e..274e1eba 100644
--- a/drive/i18n/src/main/res/values-pl/app.xml
+++ b/drive/i18n/src/main/res/values-pl/app.xml
@@ -158,6 +158,18 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Kopia zapasowa nie może zostać uruchomiona w tle</string>
   <string name="notification_content_text_backup_preparing">Przygotowywanie do tworzenia kopii zapasowej</string>
   <string name="notification_content_text_backup_failed_migration">Migracja jest w toku. Zaktualizuj aplikację</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Downloading %1$d file</item>
+    <item quantity="few">Downloading %1$d files</item>
+    <item quantity="many">Downloading %1$d files</item>
+    <item quantity="other">Downloading %1$d files</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Pobieranie zostało zakończone</string>
   <string name="notification_content_title_forced_sign_out">Zaloguj się</string>
   <string name="notification_content_text_forced_sign_out">Przepraszamy za kłopot! Mieliśmy problem z synchronizacją. Zaloguj się ponownie, a wszystko będzie działało sprawnie.</string>
diff --git a/drive/i18n/src/main/res/values-pt-rBR/app.xml b/drive/i18n/src/main/res/values-pt-rBR/app.xml
index d4425063..6ba49bfe 100644
--- a/drive/i18n/src/main/res/values-pt-rBR/app.xml
+++ b/drive/i18n/src/main/res/values-pt-rBR/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">O backup não pode ser executado em segundo plano</string>
   <string name="notification_content_text_backup_preparing">Preparando para fazer backup</string>
   <string name="notification_content_text_backup_failed_migration">Migração em curso. Atualize suo aplicativo.</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Baixando %1$d arquivo</item>
+    <item quantity="other">Baixando %1$d arquivos</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Download concluído</string>
   <string name="notification_content_title_forced_sign_out">Inicie sessão</string>
   <string name="notification_content_text_forced_sign_out">Desculpe interromper! Nós tivemos um problema com a sincronização - inicie a sessão novamente e teremos tudo funcionando perfeitamente.</string>
diff --git a/drive/i18n/src/main/res/values-pt-rBR/photos.xml b/drive/i18n/src/main/res/values-pt-rBR/photos.xml
index 417b16a1..ac422df5 100644
--- a/drive/i18n/src/main/res/values-pt-rBR/photos.xml
+++ b/drive/i18n/src/main/res/values-pt-rBR/photos.xml
@@ -174,5 +174,5 @@
     <item quantity="other">Migrando %1$s arquivos e %2$s aguardando o download.</item>
   </plurals>
   <string name="photos_folder_selection_title">Fazer backup de fotos de</string>
-  <string name="photos_folder_selection_description">Select folders to back up and their photos will appear in the Photos tab.</string>
+  <string name="photos_folder_selection_description">Selecione pastas para fazer backup e suas fotos aparecerão na guia Fotos.</string>
 </resources>
diff --git a/drive/i18n/src/main/res/values-pt-rPT/app.xml b/drive/i18n/src/main/res/values-pt-rPT/app.xml
index e44b6f51..3e8c0d08 100644
--- a/drive/i18n/src/main/res/values-pt-rPT/app.xml
+++ b/drive/i18n/src/main/res/values-pt-rPT/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">A cópia de segurança não pôde ser executada em segundo plano.</string>
   <string name="notification_content_text_backup_preparing">Preparação para a cópia de segurança</string>
   <string name="notification_content_text_backup_failed_migration">Migração em curso. Atualize a sua aplicação.</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Downloading %1$d file</item>
+    <item quantity="other">Downloading %1$d files</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Transferência concluída</string>
   <string name="notification_content_title_forced_sign_out">Inicie a sessão</string>
   <string name="notification_content_text_forced_sign_out">Pedimos desculpa pela interrupção, mas tivemos um problema com a sincronização. Inicie sessão novamente e tudo funcionará sem problemas.</string>
diff --git a/drive/i18n/src/main/res/values-ro/app.xml b/drive/i18n/src/main/res/values-ro/app.xml
index 494928e4..9d6ddca9 100644
--- a/drive/i18n/src/main/res/values-ro/app.xml
+++ b/drive/i18n/src/main/res/values-ro/app.xml
@@ -153,6 +153,17 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Conservarea nu poate funcționa în fundal.</string>
   <string name="notification_content_text_backup_preparing">Se pregătește conservarea</string>
   <string name="notification_content_text_backup_failed_migration">Migrarea e în desfășurare. Actualizați-vă aplicația.</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Se descarcă %1$d fișier.</item>
+    <item quantity="few">Se descarcă %1$d fișiere.</item>
+    <item quantity="other">Se descarcă %1$d de fișiere.</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Descărcare finalizată</string>
   <string name="notification_content_title_forced_sign_out">Autentificați-vă</string>
   <string name="notification_content_text_forced_sign_out">Ne pare rău! Am avut o problemă cu sincronizarea - reconectați-vă și totul va funcționa fără probleme.</string>
diff --git a/drive/i18n/src/main/res/values-ru/app.xml b/drive/i18n/src/main/res/values-ru/app.xml
index b183450e..53d61fa2 100644
--- a/drive/i18n/src/main/res/values-ru/app.xml
+++ b/drive/i18n/src/main/res/values-ru/app.xml
@@ -158,6 +158,18 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Резервное копирование не может выполняться в фоновом режиме</string>
   <string name="notification_content_text_backup_preparing">Подготовка к созданию резервной копии</string>
   <string name="notification_content_text_backup_failed_migration">Миграция в процессе, обновите ваше приложение</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Downloading %1$d file</item>
+    <item quantity="few">Downloading %1$d files</item>
+    <item quantity="many">Downloading %1$d files</item>
+    <item quantity="other">Downloading %1$d files</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Скачивание завершено</string>
   <string name="notification_content_title_forced_sign_out">Войдите</string>
   <string name="notification_content_text_forced_sign_out">Извините за неудобства! Произошла ошибка при синхронизации — пожалуйста, войдите снова, и всё будет работать как надо.</string>
diff --git a/drive/i18n/src/main/res/values-sk/app.xml b/drive/i18n/src/main/res/values-sk/app.xml
index 8dfe6408..e554f325 100644
--- a/drive/i18n/src/main/res/values-sk/app.xml
+++ b/drive/i18n/src/main/res/values-sk/app.xml
@@ -158,6 +158,18 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Zálohovanie nemôže prebiehať na pozadí</string>
   <string name="notification_content_text_backup_preparing">Príprava na zálohovanie</string>
   <string name="notification_content_text_backup_failed_migration">Prebieha migrácia, aktualizujte svoju aplikáciu</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Sťahovanie %1$d súboru</item>
+    <item quantity="few">Sťahovanie %1$d súborov</item>
+    <item quantity="many">Sťahovanie %1$d súborov</item>
+    <item quantity="other">Sťahovanie %1$d súborov</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Sťahovanie dokončené</string>
   <string name="notification_content_title_forced_sign_out">Prihláste sa, prosím</string>
   <string name="notification_content_text_forced_sign_out">Ospravedlňujeme sa za vyrušenie! Nastal problém so synchronizáciou - prosím prihláste sa znova a všetko bude fungovať bez problémov.</string>
diff --git a/drive/i18n/src/main/res/values-sl/app.xml b/drive/i18n/src/main/res/values-sl/app.xml
index 69ee9430..2d756030 100644
--- a/drive/i18n/src/main/res/values-sl/app.xml
+++ b/drive/i18n/src/main/res/values-sl/app.xml
@@ -158,6 +158,18 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Varnostno kopiranje ne more delovati v ozadju</string>
   <string name="notification_content_text_backup_preparing">Priprava na varnostno kopiranje</string>
   <string name="notification_content_text_backup_failed_migration">Poteka selitev. Posodobite vašo aplikacijo</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Downloading %1$d file</item>
+    <item quantity="two">Downloading %1$d files</item>
+    <item quantity="few">Downloading %1$d files</item>
+    <item quantity="other">Downloading %1$d files</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Prenos končan</string>
   <string name="notification_content_title_forced_sign_out">Prosimo prijavite se</string>
   <string name="notification_content_text_forced_sign_out">Oprostite, ker motim! Imeli smo težave s sinhronizacijo - prosimo, prijavite se znova in vse bo potekalo gladko.</string>
diff --git a/drive/i18n/src/main/res/values-sv-rSE/app.xml b/drive/i18n/src/main/res/values-sv-rSE/app.xml
index 1c898ccc..04a44af3 100644
--- a/drive/i18n/src/main/res/values-sv-rSE/app.xml
+++ b/drive/i18n/src/main/res/values-sv-rSE/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Säkerhetskopiering kan inte köras i bakgrunden</string>
   <string name="notification_content_text_backup_preparing">Förbereder att säkerhetskopiera</string>
   <string name="notification_content_text_backup_failed_migration">Migrering pågår, uppdatera din applikation</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Laddar ner %1$d fil</item>
+    <item quantity="other">Laddar ner %1$d filer</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Nedladdning slutförd</string>
   <string name="notification_content_title_forced_sign_out">Logga in</string>
   <string name="notification_content_text_forced_sign_out">Ursäkta att vi avbryter! Vi hade ett problem med synkronisering - logga in igen så kommer allt att fungera som det ska.</string>
diff --git a/drive/i18n/src/main/res/values-tr/app.xml b/drive/i18n/src/main/res/values-tr/app.xml
index e7211f3c..a8505b9c 100644
--- a/drive/i18n/src/main/res/values-tr/app.xml
+++ b/drive/i18n/src/main/res/values-tr/app.xml
@@ -148,6 +148,16 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Yedekleme arka planda çalışamaz</string>
   <string name="notification_content_text_backup_preparing">Yedeklemeye hazırlanıyor</string>
   <string name="notification_content_text_backup_failed_migration">Aktarım sürüyor. Uygulamanızı güncelleyin</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">%1$d dosya indiriliyor</item>
+    <item quantity="other">%1$d dosya indiriliyor</item>
+  </plurals>
   <string name="notification_content_title_download_complete">İndirme tamamlandı</string>
   <string name="notification_content_title_forced_sign_out">Lütfen oturum açın</string>
   <string name="notification_content_text_forced_sign_out">Böldüğümüz için üzgünüz! Bir eşitleme sorunu yaşadık. Lütfen yeniden oturum açın ki her şeyin sorunsuz çalışmasını sağlayalım.</string>
diff --git a/drive/i18n/src/main/res/values-uk/app.xml b/drive/i18n/src/main/res/values-uk/app.xml
index 1dfca200..e7e6e288 100644
--- a/drive/i18n/src/main/res/values-uk/app.xml
+++ b/drive/i18n/src/main/res/values-uk/app.xml
@@ -158,6 +158,18 @@
   <string name="notification_content_text_backup_paused_background_restrictions">Резервне копіювання не може працювати на задньому плані</string>
   <string name="notification_content_text_backup_preparing">Підготовка до резервного копіювання</string>
   <string name="notification_content_text_backup_failed_migration">Перенесення триває, оновіть свій застосунок</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="one">Downloading %1$d file</item>
+    <item quantity="few">Downloading %1$d files</item>
+    <item quantity="many">Downloading %1$d files</item>
+    <item quantity="other">Downloading %1$d files</item>
+  </plurals>
   <string name="notification_content_title_download_complete">Звантаження завершено</string>
   <string name="notification_content_title_forced_sign_out">Увійдіть</string>
   <string name="notification_content_text_forced_sign_out">Перепрошуємо, що перериваємо! У нас виникла проблема з синхронізацією. Увійдіть ще раз, і все працюватиме без збоїв.</string>
diff --git a/drive/i18n/src/main/res/values-zh-rCN/app.xml b/drive/i18n/src/main/res/values-zh-rCN/app.xml
index 5d98821d..323d9990 100644
--- a/drive/i18n/src/main/res/values-zh-rCN/app.xml
+++ b/drive/i18n/src/main/res/values-zh-rCN/app.xml
@@ -143,6 +143,15 @@
   <string name="notification_content_text_backup_paused_background_restrictions">备份任务无法在后台运行</string>
   <string name="notification_content_text_backup_preparing">准备备份</string>
   <string name="notification_content_text_backup_failed_migration">迁移进行中，请更新您的应用程序</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="other">正在下载 %1$d 个文件</item>
+  </plurals>
   <string name="notification_content_title_download_complete">下载完成</string>
   <string name="notification_content_title_forced_sign_out">请登录</string>
   <string name="notification_content_text_forced_sign_out">很抱歉打扰您！我们的同步出现了问题 - 请重新登录，一切将顺利运行。</string>
diff --git a/drive/i18n/src/main/res/values-zh-rTW/app.xml b/drive/i18n/src/main/res/values-zh-rTW/app.xml
index 8235b156..1dc49f4d 100644
--- a/drive/i18n/src/main/res/values-zh-rTW/app.xml
+++ b/drive/i18n/src/main/res/values-zh-rTW/app.xml
@@ -143,6 +143,15 @@
   <string name="notification_content_text_backup_paused_background_restrictions">備份無法於背景運作</string>
   <string name="notification_content_text_backup_preparing">正在準備備份</string>
   <string name="notification_content_text_backup_failed_migration">遷移中，請更新您的應用程式</string>
+  <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+  <plurals name="notification_content_text_download_downloading">
+    <item quantity="other">Downloading %1$d files</item>
+  </plurals>
   <string name="notification_content_title_download_complete">下載完成</string>
   <string name="notification_content_title_forced_sign_out">請登入</string>
   <string name="notification_content_text_forced_sign_out">抱歉打斷您！出現了同步問題，請重新登入，才能流暢運作。</string>
diff --git a/drive/i18n/src/main/res/values/app.xml b/drive/i18n/src/main/res/values/app.xml
index a304d00e..8e8fa324 100644
--- a/drive/i18n/src/main/res/values/app.xml
+++ b/drive/i18n/src/main/res/values/app.xml
@@ -159,6 +159,16 @@
     <string name="notification_content_text_backup_paused_background_restrictions">Backup cannot run in background</string>
     <string name="notification_content_text_backup_preparing">Preparing to back up</string>
     <string name="notification_content_text_backup_failed_migration">Migration in progress, update your application</string>
+    <!--
+        Variable %1$d is a quantity of files currently being downloaded
+        Example:
+            "Downloading 1 file"
+            "Downloading 3 files"
+    -->
+    <plurals name="notification_content_text_download_downloading">
+        <item quantity="one">Downloading %1$d file</item>
+        <item quantity="other">Downloading %1$d files</item>
+    </plurals>
     <string name="notification_content_title_download_complete">Download complete</string>
     <string name="notification_content_title_forced_sign_out">Please log in</string>
     <string name="notification_content_text_forced_sign_out">Sorry to interrupt! We had an issue with syncing - please log in again and we\'ll have everything running smoothly.</string>
diff --git a/drive/i18n/src/main/res/values/common.xml b/drive/i18n/src/main/res/values/common.xml
index c84cc1cf..d899832a 100644
--- a/drive/i18n/src/main/res/values/common.xml
+++ b/drive/i18n/src/main/res/values/common.xml
@@ -29,7 +29,9 @@
     <string name="common_type">Type</string>
     <string name="common_yes">Yes</string>
     <string name="common_download">Download</string>
+    <string name="common_downloaded">Downloaded</string>
     <string name="common_downloading">Downloading</string>
+    <string name="common_waiting_for_download">Waiting for download</string>
     <string name="common_link">Link</string>
     <string name="common_password">Password</string>
     <string name="common_retry">Retry</string>
@@ -79,6 +81,8 @@
     <string name="common_tag_photo_action">Scan photo for tags</string>
     <string name="common_save_as_action">Save as</string>
     <string name="common_open_action">Open</string>
+    <string name="common_back_action">Back</string>
+    <string name="common_open_side_menu_action">Open side menu</string>
     <!-- endregion -->
     <!-- region Common file types -->
     <string name="common_type_audio">Audio</string>
diff --git a/drive/link-selection/domain/src/main/kotlin/me/proton/core/drive/link/selection/domain/usecase/DeselectLinks.kt b/drive/link-selection/domain/src/main/kotlin/me/proton/core/drive/link/selection/domain/usecase/DeselectLinks.kt
index f4bf41e8..7b9bbbda 100644
--- a/drive/link-selection/domain/src/main/kotlin/me/proton/core/drive/link/selection/domain/usecase/DeselectLinks.kt
+++ b/drive/link-selection/domain/src/main/kotlin/me/proton/core/drive/link/selection/domain/usecase/DeselectLinks.kt
@@ -17,6 +17,7 @@
  */
 package me.proton.core.drive.link.selection.domain.usecase
 
+import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.link.domain.entity.LinkId
 import me.proton.core.drive.link.selection.domain.entity.SelectionId
 import me.proton.core.drive.link.selection.domain.repository.LinkSelectionRepository
@@ -25,9 +26,11 @@ import javax.inject.Inject
 class DeselectLinks @Inject constructor(
     private val repository: LinkSelectionRepository,
 ) {
-    suspend operator fun invoke(selectionId: SelectionId, linkIds: List<LinkId>) =
+    suspend operator fun invoke(selectionId: SelectionId, linkIds: List<LinkId>) = coRunCatching {
         repository.remove(selectionId, linkIds)
+    }
 
-    suspend operator fun invoke(selectionId: SelectionId) =
+    suspend operator fun invoke(selectionId: SelectionId) = coRunCatching {
         repository.remove(selectionId)
+    }
 }
diff --git a/drive/link-selection/domain/src/main/kotlin/me/proton/core/drive/link/selection/domain/usecase/SelectLinks.kt b/drive/link-selection/domain/src/main/kotlin/me/proton/core/drive/link/selection/domain/usecase/SelectLinks.kt
index 77664b34..bd96a9e4 100644
--- a/drive/link-selection/domain/src/main/kotlin/me/proton/core/drive/link/selection/domain/usecase/SelectLinks.kt
+++ b/drive/link-selection/domain/src/main/kotlin/me/proton/core/drive/link/selection/domain/usecase/SelectLinks.kt
@@ -17,6 +17,7 @@
  */
 package me.proton.core.drive.link.selection.domain.usecase
 
+import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.link.domain.entity.LinkId
 import me.proton.core.drive.link.selection.domain.entity.SelectionId
 import me.proton.core.drive.link.selection.domain.repository.LinkSelectionRepository
@@ -25,9 +26,11 @@ import javax.inject.Inject
 class SelectLinks @Inject constructor(
     private val repository: LinkSelectionRepository
 ) {
-    suspend operator fun invoke(linkIds: List<LinkId>) =
-        repository.insertSelection(linkIds)
+    suspend operator fun invoke(linkIds: List<LinkId>) = coRunCatching {
+        repository.insertSelection(linkIds).getOrThrow()
+    }
 
-    suspend operator fun invoke(selectionId: SelectionId, linkIds: List<LinkId>) =
+    suspend operator fun invoke(selectionId: SelectionId, linkIds: List<LinkId>) = coRunCatching {
         repository.insertOrIgnoreSelection(selectionId, linkIds)
+    }
 }
diff --git a/drive/link-upload/data/build.gradle.kts b/drive/link-upload/data/build.gradle.kts
index ca03e855..1eac02d7 100644
--- a/drive/link-upload/data/build.gradle.kts
+++ b/drive/link-upload/data/build.gradle.kts
@@ -31,4 +31,5 @@ driveModule(
 ) {
     api(project(":drive:link:data"))
     api(project(":drive:link-upload:domain"))
+    api(project(":drive:share:data"))
 }
diff --git a/drive/link-upload/data/src/main/kotlin/me/proton/core/drive/linkupload/data/db/dao/LinkUploadDao.kt b/drive/link-upload/data/src/main/kotlin/me/proton/core/drive/linkupload/data/db/dao/LinkUploadDao.kt
index 6ab8d8db..378028d0 100644
--- a/drive/link-upload/data/src/main/kotlin/me/proton/core/drive/linkupload/data/db/dao/LinkUploadDao.kt
+++ b/drive/link-upload/data/src/main/kotlin/me/proton/core/drive/linkupload/data/db/dao/LinkUploadDao.kt
@@ -194,16 +194,34 @@ abstract class LinkUploadDao : BaseDao<LinkUploadEntity>() {
     abstract fun getAllWithUriByPriority(userId: UserId, states: Set<UploadState>, count: Int): Flow<List<LinkUploadEntity>>
 
     @Query("""
-        SELECT * FROM LinkUploadEntity
+        SELECT LinkUploadEntity.* FROM LinkUploadEntity
+        INNER JOIN ShareEntity ON
+            LinkUploadEntity.share_id = ShareEntity.id AND
+            LinkUploadEntity.user_id = ShareEntity.user_id
         WHERE
-            user_id = :userId AND
-            volume_id = :volumeId AND
-            uri IS NOT NULL AND uri != "" AND
-            state IN (:states)
-        ORDER BY priority ASC, id ASC
+            LinkUploadEntity.user_id = :userId AND
+            ShareEntity.type = :type AND
+            LinkUploadEntity.uri IS NOT NULL AND LinkUploadEntity.uri != "" AND
+            LinkUploadEntity.state IN (:states)
+        ORDER BY LinkUploadEntity.priority ASC, LinkUploadEntity.id ASC
         LIMIT :count
     """)
-    abstract fun getAllWithUriByPriority(userId: UserId, volumeId: String, states: Set<UploadState>, count: Int): Flow<List<LinkUploadEntity>>
+    abstract fun getAllWithUriByPriorityWithShareType(userId: UserId, states: Set<UploadState>, type: Long, count: Int): Flow<List<LinkUploadEntity>>
+
+    @Query("""
+        SELECT LinkUploadEntity.* FROM LinkUploadEntity
+        LEFT JOIN ShareEntity ON
+            LinkUploadEntity.share_id = ShareEntity.id AND
+            LinkUploadEntity.user_id = ShareEntity.user_id
+        WHERE
+            LinkUploadEntity.user_id = :userId AND
+            COALESCE(ShareEntity.type, 0) != :type AND
+            LinkUploadEntity.uri IS NOT NULL AND LinkUploadEntity.uri != "" AND
+            LinkUploadEntity.state IN (:states)
+        ORDER BY LinkUploadEntity.priority ASC, LinkUploadEntity.id ASC
+        LIMIT :count
+    """)
+    abstract fun getAllWithUriByPriorityWithoutShareType(userId: UserId, states: Set<UploadState>, type: Long, count: Int): Flow<List<LinkUploadEntity>>
 
     @Query("""
         SELECT COUNT(*) FROM (SELECT * FROM LinkUploadEntity WHERE user_id = :userId)
@@ -268,27 +286,74 @@ abstract class LinkUploadDao : BaseDao<LinkUploadEntity>() {
         """
         SELECT
             COUNT(*) AS ${Column.TOTAL},
-            COUNT(CASE WHEN uri IS NOT NULL AND uri != "" THEN 1 ELSE NULL END) AS ${Column.TOTAL_WITH_URI},
+            COUNT(CASE WHEN LinkUploadEntity.uri IS NOT NULL AND LinkUploadEntity.uri != "" THEN 1 ELSE NULL END) AS ${Column.TOTAL_WITH_URI},
             COUNT(
-                CASE WHEN uri IS NOT NULL AND uri != "" AND priority > :userPriority THEN 1 ELSE NULL END
+                CASE WHEN LinkUploadEntity.uri IS NOT NULL AND LinkUploadEntity.uri != "" AND LinkUploadEntity.priority > :userPriority THEN 1 ELSE NULL END
             ) AS ${Column.TOTAL_WITH_URI_NON_USER_PRIORITY},
             COUNT(
-                CASE WHEN uri IS NOT NULL AND uri != "" AND state = "UNPROCESSED"
+                CASE WHEN LinkUploadEntity.uri IS NOT NULL AND LinkUploadEntity.uri != "" AND LinkUploadEntity.state = "UNPROCESSED"
                     THEN 1
                     ELSE NULL
                 END
             ) AS ${Column.TOTAL_UNPROCESSED_WITH_URI},
             COUNT(
-                CASE WHEN uri IS NOT NULL AND uri != "" AND state = "UNPROCESSED" AND priority > :userPriority
+                CASE WHEN LinkUploadEntity.uri IS NOT NULL AND LinkUploadEntity.uri != "" AND LinkUploadEntity.state = "UNPROCESSED" AND LinkUploadEntity.priority > :userPriority
                     THEN 1
                     ELSE NULL
                 END
             ) AS ${Column.TOTAL_UNPROCESSED_WITH_URI_NON_USER_PRIORITY},
-            COUNT(CASE WHEN should_announce_event = 1 THEN 1 ELSE NULL END) AS ${Column.TOTAL_WITH_ANNOUNCE}
-        FROM LinkUploadEntity WHERE user_id = :userId AND volume_id = :volumeId
+            COUNT(CASE WHEN LinkUploadEntity.should_announce_event = 1 THEN 1 ELSE NULL END) AS ${Column.TOTAL_WITH_ANNOUNCE}
+        FROM LinkUploadEntity
+        INNER JOIN ShareEntity ON
+            LinkUploadEntity.share_id = ShareEntity.id AND
+            LinkUploadEntity.user_id = ShareEntity.user_id
+        WHERE
+            LinkUploadEntity.user_id = :userId AND
+            ShareEntity.type = :type
     """
     )
-    abstract fun getUploadCount(userId: UserId, volumeId: String, userPriority: Long): Flow<LinkUploadCountEntity>
+    abstract fun getUploadCountWithShareType(
+        userId: UserId,
+        type: Long,
+        userPriority: Long
+    ): Flow<LinkUploadCountEntity>
+
+    @Transaction
+    @Query(
+        """
+        SELECT
+            COUNT(*) AS ${Column.TOTAL},
+            COUNT(CASE WHEN LinkUploadEntity.uri IS NOT NULL AND LinkUploadEntity.uri != "" THEN 1 ELSE NULL END) AS ${Column.TOTAL_WITH_URI},
+            COUNT(
+                CASE WHEN LinkUploadEntity.uri IS NOT NULL AND LinkUploadEntity.uri != "" AND LinkUploadEntity.priority > :userPriority THEN 1 ELSE NULL END
+            ) AS ${Column.TOTAL_WITH_URI_NON_USER_PRIORITY},
+            COUNT(
+                CASE WHEN LinkUploadEntity.uri IS NOT NULL AND LinkUploadEntity.uri != "" AND LinkUploadEntity.state = "UNPROCESSED"
+                    THEN 1
+                    ELSE NULL
+                END
+            ) AS ${Column.TOTAL_UNPROCESSED_WITH_URI},
+            COUNT(
+                CASE WHEN LinkUploadEntity.uri IS NOT NULL AND LinkUploadEntity.uri != "" AND LinkUploadEntity.state = "UNPROCESSED" AND LinkUploadEntity.priority > :userPriority
+                    THEN 1
+                    ELSE NULL
+                END
+            ) AS ${Column.TOTAL_UNPROCESSED_WITH_URI_NON_USER_PRIORITY},
+            COUNT(CASE WHEN LinkUploadEntity.should_announce_event = 1 THEN 1 ELSE NULL END) AS ${Column.TOTAL_WITH_ANNOUNCE}
+        FROM LinkUploadEntity
+        LEFT JOIN ShareEntity ON
+            LinkUploadEntity.share_id = ShareEntity.id AND
+            LinkUploadEntity.user_id = ShareEntity.user_id
+        WHERE
+            LinkUploadEntity.user_id = :userId AND
+            COALESCE(ShareEntity.type, 0) != :type
+    """
+    )
+    abstract fun getUploadCountWithoutShareType(
+        userId: UserId,
+        type: Long,
+        userPriority: Long
+    ): Flow<LinkUploadCountEntity>
 
     @Query(
         """
diff --git a/drive/link-upload/data/src/main/kotlin/me/proton/core/drive/linkupload/data/repository/LinkUploadRepositoryImpl.kt b/drive/link-upload/data/src/main/kotlin/me/proton/core/drive/linkupload/data/repository/LinkUploadRepositoryImpl.kt
index 72cab3ca..4315a937 100644
--- a/drive/link-upload/data/src/main/kotlin/me/proton/core/drive/linkupload/data/repository/LinkUploadRepositoryImpl.kt
+++ b/drive/link-upload/data/src/main/kotlin/me/proton/core/drive/linkupload/data/repository/LinkUploadRepositoryImpl.kt
@@ -58,8 +58,9 @@ import me.proton.core.drive.linkupload.domain.entity.UploadFileLink
 import me.proton.core.drive.linkupload.domain.entity.UploadState
 import me.proton.core.drive.linkupload.domain.factory.UploadBlockFactory
 import me.proton.core.drive.linkupload.domain.repository.LinkUploadRepository
+import me.proton.core.drive.share.data.extension.toLong
+import me.proton.core.drive.share.domain.entity.Share
 import me.proton.core.drive.share.domain.entity.ShareId
-import me.proton.core.drive.volume.domain.entity.VolumeId
 import me.proton.core.util.kotlin.serialize
 import javax.inject.Inject
 import kotlin.time.Duration
@@ -170,24 +171,46 @@ class LinkUploadRepositoryImpl @Inject constructor(
 
     override suspend fun getUploadFileLinksWithUriByPriority(
         userId: UserId,
-        volumeId: VolumeId,
+        isPhotoShare: Boolean,
         states: Set<UploadState>,
         count: Int,
-    ): Flow<List<UploadFileLink>> =
-        db.linkUploadDao.getAllWithUriByPriority(userId, volumeId.id, states, count)
-            .map { linkUploadEntities ->
-                linkUploadEntities.map { it.toUploadFileLink() }
-            }
+    ): Flow<List<UploadFileLink>> = if (isPhotoShare) {
+        db.linkUploadDao.getAllWithUriByPriorityWithShareType(
+            userId = userId,
+            states = states,
+            type = Share.Type.PHOTO.toLong(),
+            count = count,
+        )
+    } else {
+        db.linkUploadDao.getAllWithUriByPriorityWithoutShareType(
+            userId = userId,
+            states = states,
+            type = Share.Type.PHOTO.toLong(),
+            count = count,
+        )
+    }.map { linkUploadEntities -> linkUploadEntities.map { it.toUploadFileLink() } }
 
     override fun getUploadFileLinksCount(userId: UserId): Flow<UploadCount> =
         db.linkUploadDao.getUploadCount(userId, UploadFileLink.USER_PRIORITY).map { linkUploadCountEntity ->
             linkUploadCountEntity.toUploadCount()
         }
 
-    override fun getUploadFileLinksCount(userId: UserId, volumeId: VolumeId): Flow<UploadCount> =
-        db.linkUploadDao.getUploadCount(userId, volumeId.id, UploadFileLink.USER_PRIORITY).map { linkUploadCountEntity ->
-            linkUploadCountEntity.toUploadCount()
-        }
+    override fun getUploadFileLinksCount(
+        userId: UserId,
+        isPhotoShare: Boolean,
+    ): Flow<UploadCount> = if (isPhotoShare) {
+        db.linkUploadDao.getUploadCountWithShareType(
+            userId = userId,
+            type = Share.Type.PHOTO.toLong(),
+            userPriority = UploadFileLink.USER_PRIORITY
+        )
+    } else {
+        db.linkUploadDao.getUploadCountWithoutShareType(
+            userId = userId,
+            type = Share.Type.PHOTO.toLong(),
+            userPriority = UploadFileLink.USER_PRIORITY
+        )
+    }.map { it.toUploadCount() }
 
     override suspend fun getUploadFileLinksSize(
         userId: UserId, uploadStates: Set<UploadState>
@@ -434,3 +457,4 @@ class LinkUploadRepositoryImpl @Inject constructor(
                 .toTypedArray()
         )
 }
+
diff --git a/drive/link-upload/domain/src/main/kotlin/me/proton/core/drive/linkupload/domain/repository/LinkUploadRepository.kt b/drive/link-upload/domain/src/main/kotlin/me/proton/core/drive/linkupload/domain/repository/LinkUploadRepository.kt
index a837164b..25c22d40 100644
--- a/drive/link-upload/domain/src/main/kotlin/me/proton/core/drive/linkupload/domain/repository/LinkUploadRepository.kt
+++ b/drive/link-upload/domain/src/main/kotlin/me/proton/core/drive/linkupload/domain/repository/LinkUploadRepository.kt
@@ -36,7 +36,6 @@ import me.proton.core.drive.linkupload.domain.entity.UploadDigests
 import me.proton.core.drive.linkupload.domain.entity.UploadFileLink
 import me.proton.core.drive.linkupload.domain.entity.UploadState
 import me.proton.core.drive.share.domain.entity.ShareId
-import me.proton.core.drive.volume.domain.entity.VolumeId
 import kotlin.time.Duration
 
 interface LinkUploadRepository {
@@ -90,14 +89,14 @@ interface LinkUploadRepository {
 
     suspend fun getUploadFileLinksWithUriByPriority(
         userId: UserId,
-        volumeId: VolumeId,
+        isPhotoShare: Boolean,
         states: Set<UploadState>,
         count: Int,
     ): Flow<List<UploadFileLink>>
 
     fun getUploadFileLinksCount(userId: UserId): Flow<UploadCount>
 
-    fun getUploadFileLinksCount(userId: UserId, volumeId: VolumeId): Flow<UploadCount>
+    fun getUploadFileLinksCount(userId: UserId, isPhotoShare: Boolean): Flow<UploadCount>
 
     suspend fun getUploadFileLinksSize(userId: UserId, uploadStates: Set<UploadState>): Bytes
 
diff --git a/drive/link-upload/domain/src/main/kotlin/me/proton/core/drive/linkupload/domain/usecase/GetUploadFileLinksCount.kt b/drive/link-upload/domain/src/main/kotlin/me/proton/core/drive/linkupload/domain/usecase/GetUploadFileLinksCount.kt
index da18284c..33b7f5c5 100644
--- a/drive/link-upload/domain/src/main/kotlin/me/proton/core/drive/linkupload/domain/usecase/GetUploadFileLinksCount.kt
+++ b/drive/link-upload/domain/src/main/kotlin/me/proton/core/drive/linkupload/domain/usecase/GetUploadFileLinksCount.kt
@@ -22,7 +22,6 @@ import kotlinx.coroutines.flow.Flow
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.linkupload.domain.entity.UploadCount
 import me.proton.core.drive.linkupload.domain.repository.LinkUploadRepository
-import me.proton.core.drive.volume.domain.entity.VolumeId
 import javax.inject.Inject
 
 class GetUploadFileLinksCount @Inject constructor(
@@ -31,6 +30,6 @@ class GetUploadFileLinksCount @Inject constructor(
     operator fun invoke(userId: UserId): Flow<UploadCount> =
         linkUploadRepository.getUploadFileLinksCount(userId)
 
-    operator fun invoke(userId: UserId, volumeId: VolumeId): Flow<UploadCount> =
-        linkUploadRepository.getUploadFileLinksCount(userId, volumeId)
+    operator fun invoke(userId: UserId, isPhotoShare: Boolean): Flow<UploadCount> =
+        linkUploadRepository.getUploadFileLinksCount(userId, isPhotoShare)
 }
diff --git a/drive/link-upload/domain/src/main/kotlin/me/proton/core/drive/linkupload/domain/usecase/GetUploadFileLinksWithUriByPriority.kt b/drive/link-upload/domain/src/main/kotlin/me/proton/core/drive/linkupload/domain/usecase/GetUploadFileLinksWithUriByPriority.kt
index 42bfbcac..df401347 100644
--- a/drive/link-upload/domain/src/main/kotlin/me/proton/core/drive/linkupload/domain/usecase/GetUploadFileLinksWithUriByPriority.kt
+++ b/drive/link-upload/domain/src/main/kotlin/me/proton/core/drive/linkupload/domain/usecase/GetUploadFileLinksWithUriByPriority.kt
@@ -23,7 +23,6 @@ import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.linkupload.domain.entity.UploadFileLink
 import me.proton.core.drive.linkupload.domain.entity.UploadState
 import me.proton.core.drive.linkupload.domain.repository.LinkUploadRepository
-import me.proton.core.drive.volume.domain.entity.VolumeId
 import javax.inject.Inject
 
 class GetUploadFileLinksWithUriByPriority @Inject constructor(
@@ -38,9 +37,14 @@ class GetUploadFileLinksWithUriByPriority @Inject constructor(
 
     suspend operator fun invoke(
         userId: UserId,
-        volumeId: VolumeId,
+        isPhotoShare: Boolean,
         states: Set<UploadState>,
         count: Int
     ): Flow<List<UploadFileLink>> =
-        linkUploadRepository.getUploadFileLinksWithUriByPriority(userId, volumeId, states, count)
+        linkUploadRepository.getUploadFileLinksWithUriByPriority(
+            userId = userId,
+            isPhotoShare = isPhotoShare,
+            states = states,
+            count = count,
+        )
 }
diff --git a/drive/link/data/build.gradle.kts b/drive/link/data/build.gradle.kts
index 4c4fea48..bed6b20f 100644
--- a/drive/link/data/build.gradle.kts
+++ b/drive/link/data/build.gradle.kts
@@ -19,7 +19,6 @@
 plugins {
     id("com.android.library")
     kotlin("android")
-    kotlin("kapt")
 }
 
 android {
@@ -37,6 +36,6 @@ driveModule(
     implementation(project(":drive:share:data"))
     implementation(libs.retrofit)
     androidTestImplementation(project(":drive:db"))
-    kaptAndroidTest(libs.androidx.room.compiler)
+    add("kspAndroidTest", libs.androidx.room.compiler)
     testImplementation(project(":drive:db-test"))
 }
diff --git a/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/api/entity/LinkActiveRevisionDto.kt b/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/api/entity/LinkActiveRevisionDto.kt
index 67cd7753..aab5a7cd 100644
--- a/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/api/entity/LinkActiveRevisionDto.kt
+++ b/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/api/entity/LinkActiveRevisionDto.kt
@@ -19,6 +19,7 @@ package me.proton.core.drive.link.data.api.entity
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import me.proton.core.drive.base.data.api.Dto.CHECKSUM_VERIFIED
 import me.proton.core.drive.base.data.api.Dto.CREATE_TIME
 import me.proton.core.drive.base.data.api.Dto.ID
 import me.proton.core.drive.base.data.api.Dto.MANIFEST_SIGNATURE
@@ -49,4 +50,6 @@ data class LinkActiveRevisionDto(
     val photo: LinkPhotoDto? = null,
     @SerialName(THUMBNAILS)
     val thumbnails: List<LinkThumbnailDto>,
+    @SerialName(CHECKSUM_VERIFIED)
+    val checksumVerified: Boolean = false,
 )
diff --git a/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/db/LinkDatabase.kt b/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/db/LinkDatabase.kt
index a03c02ce..e3e9c8d2 100644
--- a/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/db/LinkDatabase.kt
+++ b/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/db/LinkDatabase.kt
@@ -21,6 +21,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import me.proton.core.data.room.db.Database
 import me.proton.core.data.room.db.migration.DatabaseMigration
 import me.proton.core.drive.base.data.db.Column.CAPTURE_TIME
+import me.proton.core.drive.base.data.db.Column.CHECKSUM_VERIFIED
 import me.proton.core.drive.base.data.db.Column.CONTENT_HASH
 import me.proton.core.drive.base.data.db.Column.MAIN_PHOTO_LINK_ID
 import me.proton.core.drive.base.data.db.Column.SHARE_URL_ID
@@ -129,5 +130,15 @@ interface LinkDatabase : Database {
                 """.trimIndent())
             }
         }
+
+        val MIGRATION_4 = object : DatabaseMigration {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    """
+                        ALTER TABLE `LinkFilePropertiesEntity` ADD COLUMN $CHECKSUM_VERIFIED INTEGER NOT NULL DEFAULT 0
+                    """.trimIndent()
+                )
+            }
+        }
     }
 }
diff --git a/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/db/entity/LinkFilePropertiesEntity.kt b/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/db/entity/LinkFilePropertiesEntity.kt
index 5736c7f4..e8f9875e 100644
--- a/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/db/entity/LinkFilePropertiesEntity.kt
+++ b/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/db/entity/LinkFilePropertiesEntity.kt
@@ -23,6 +23,7 @@ import androidx.room.ForeignKey
 import androidx.room.Index
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.base.data.db.Column.CAPTURE_TIME
+import me.proton.core.drive.base.data.db.Column.CHECKSUM_VERIFIED
 import me.proton.core.drive.base.data.db.Column.CONTENT_HASH
 import me.proton.core.drive.base.data.db.Column.CONTENT_KEY_PACKET
 import me.proton.core.drive.base.data.db.Column.CONTENT_KEY_PACKET_SIGNATURE
@@ -87,4 +88,6 @@ data class LinkFilePropertiesEntity(
     val defaultThumbnailId: String? = null,
     @ColumnInfo(name = THUMBNAIL_ID_PHOTO)
     val photoThumbnailId: String? = null,
+    @ColumnInfo(name = CHECKSUM_VERIFIED)
+    val activeRevisionChecksumVerified: Boolean = false,
 ) : LinkPropertiesEntity
diff --git a/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/extension/Link.kt b/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/extension/Link.kt
index d8e49dec..c6b4a6b9 100644
--- a/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/extension/Link.kt
+++ b/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/extension/Link.kt
@@ -76,6 +76,7 @@ fun Link.toLinkWithProperties() = LinkWithProperties(
             mainPhotoLinkId = mainPhotoLinkId,
             defaultThumbnailId = defaultThumbnailId,
             photoThumbnailId = photoThumbnailId,
+            activeRevisionChecksumVerified = activeRevisionChecksumVerified,
         )
         is Link.Folder -> LinkFolderPropertiesEntity(
             userId = id.userId,
diff --git a/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/extension/LinkFilePropertiesDto.kt b/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/extension/LinkFilePropertiesDto.kt
index 14d2c7a5..901d3ad0 100644
--- a/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/extension/LinkFilePropertiesDto.kt
+++ b/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/extension/LinkFilePropertiesDto.kt
@@ -43,4 +43,5 @@ fun LinkFilePropertiesDto.toLinkFilePropertiesEntity(userId: UserId, shareId: St
             .thumbnails
             .firstOrNull { linkThumbnailDto -> linkThumbnailDto.type == LinkThumbnailDto.TYPE_PHOTO }
             ?.thumbnailId,
+        activeRevisionChecksumVerified = activeRevision.checksumVerified,
     )
diff --git a/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/extension/LinkWithProperties.kt b/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/extension/LinkWithProperties.kt
index 365c79c5..2865cec2 100644
--- a/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/extension/LinkWithProperties.kt
+++ b/drive/link/data/src/main/kotlin/me/proton/core/drive/link/data/extension/LinkWithProperties.kt
@@ -80,6 +80,7 @@ fun LinkWithProperties.toLink(): Link {
             relatedPhotoIds = relatedPhotoIds.map { relatedPhotoId ->
                 FileId(shareId, relatedPhotoId)
             },
+            activeRevisionChecksumVerified = properties.activeRevisionChecksumVerified,
         )
 
         is LinkFolderPropertiesEntity -> Link.Folder(
diff --git a/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/entity/Link.kt b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/entity/Link.kt
index 5c9775a1..af290a47 100644
--- a/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/entity/Link.kt
+++ b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/entity/Link.kt
@@ -135,6 +135,7 @@ sealed class Link : BaseLink {
         val tags: List<PhotoTag> = emptyList(),
         val albumsInfos: List<AlbumInfo> = emptyList(),
         val relatedPhotoIds: List<FileId> = emptyList(),
+        val activeRevisionChecksumVerified: Boolean = false,
     ) : Link(), me.proton.core.drive.link.domain.entity.File {
         override val isFavorite: Boolean
             get() = PhotoTag.Favorites in tags
diff --git a/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/Link.kt b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/Link.kt
index f31ce070..91ef57ab 100644
--- a/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/Link.kt
+++ b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/Link.kt
@@ -20,7 +20,6 @@ package me.proton.core.drive.link.domain.extension
 
 import me.proton.core.drive.link.domain.entity.Link
 import me.proton.core.drive.volume.domain.entity.VolumeId
-import me.proton.drive.sdk.Uid
 
 val Link.File.isPhoto : Boolean get() = photoCaptureTime != null
 
diff --git a/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/LinkId.kt b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/LinkId.kt
index f85746c8..95e263db 100644
--- a/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/LinkId.kt
+++ b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/LinkId.kt
@@ -20,7 +20,10 @@ package me.proton.core.drive.link.domain.extension
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.link.domain.entity.LinkId
 import me.proton.core.drive.volume.domain.entity.VolumeId
-import me.proton.drive.sdk.Uid
+import me.proton.drive.sdk.entity.LegacyNodeUid
+import me.proton.drive.sdk.entity.LegacyRevisionUid
+import me.proton.drive.sdk.entity.NodeUid
+import me.proton.drive.sdk.entity.RevisionUid
 
 val LinkId.userId: UserId get() = shareId.userId
 
@@ -31,4 +34,13 @@ fun LinkId?.equalsAsLinkId(other: LinkId?): Boolean =
         shareId == other?.shareId && id == other.id
     }
 
-fun LinkId.nodeUid(volumeId: VolumeId) = Uid.makeNodeUid(volumeId.id, id)
+fun LinkId.nodeUid(volumeId: VolumeId): NodeUid = LegacyNodeUid(
+    volumeId = volumeId.id,
+    linkId = id,
+)
+
+fun LinkId.revisionUid(volumeId: VolumeId, revisionId: String): RevisionUid = LegacyRevisionUid(
+    volumeId = volumeId.id,
+    linkId = id,
+    revisionId = revisionId,
+)
diff --git a/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/Node.kt b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/Node.kt
index 90de8d3e..6bdc46aa 100644
--- a/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/Node.kt
+++ b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/Node.kt
@@ -20,12 +20,18 @@ package me.proton.core.drive.link.domain.extension
 
 import me.proton.core.drive.link.domain.entity.FileId
 import me.proton.core.drive.link.domain.entity.FolderId
+import me.proton.core.drive.link.domain.entity.LinkId
 import me.proton.core.drive.share.domain.entity.ShareId
 import me.proton.drive.sdk.entity.FileNode
 import me.proton.drive.sdk.entity.FolderNode
 import me.proton.drive.sdk.entity.Node
 
-fun FolderNode.id(shareId: ShareId) = FolderId(shareId, linkId())
-fun FileNode.id(shareId: ShareId) = FileId(shareId, linkId())
+fun Node.linkId(shareId: ShareId): LinkId = when (this) {
+    is FileNode -> linkId(shareId)
+    is FolderNode -> linkId(shareId)
+}
 
-private fun Node.linkId(): String = uid.split("~").last()
+fun FolderNode.linkId(shareId: ShareId) = FolderId(shareId, linkId)
+fun FileNode.linkId(shareId: ShareId) = FileId(shareId, linkId)
+
+private val Node.linkId: String get() = uid.linkId
diff --git a/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/NodeUid.kt b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/NodeUid.kt
new file mode 100644
index 00000000..9c1d73d3
--- /dev/null
+++ b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/NodeUid.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.link.domain.extension
+
+import me.proton.drive.sdk.entity.LegacyNodeUid
+import me.proton.drive.sdk.entity.NodeUid
+
+val NodeUid.linkId: String get() = (this as LegacyNodeUid).linkId
diff --git a/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/RevisionUid.kt b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/RevisionUid.kt
new file mode 100644
index 00000000..8d27dc87
--- /dev/null
+++ b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/extension/RevisionUid.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.link.domain.extension
+
+import me.proton.drive.sdk.entity.LegacyRevisionUid
+import me.proton.drive.sdk.entity.RevisionUid
+
+val RevisionUid.linkId: String get() = (this as LegacyRevisionUid).nodeUid.linkId
+val RevisionUid.revisionId: String get() = (this as LegacyRevisionUid).revisionId
diff --git a/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/provider/ProtonSdkClientProvider.kt b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/provider/ProtonSdkClientProvider.kt
new file mode 100644
index 00000000..ec9a5faf
--- /dev/null
+++ b/drive/link/domain/src/main/kotlin/me/proton/core/drive/link/domain/provider/ProtonSdkClientProvider.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.link.domain.provider
+
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.link.domain.entity.LinkId
+import me.proton.core.drive.volume.domain.entity.Volume
+import me.proton.core.drive.volume.domain.entity.VolumeId
+import me.proton.drive.sdk.ProtonSdkClient
+
+interface ProtonSdkClientProvider {
+
+    suspend fun getOrCreate(linkId: LinkId): Result<ProtonSdkClient>
+    suspend fun getOrCreate(userId: UserId, volumeType: Volume.Type?): Result<ProtonSdkClient>
+    suspend fun getOrCreate(userId: UserId, volumeId: VolumeId): Result<ProtonSdkClient>
+}
diff --git a/drive/log/domain/src/main/kotlin/me/proton/core/drive/log/domain/extension/Event.DownloadFileProgress.kt b/drive/log/domain/src/main/kotlin/me/proton/core/drive/log/domain/extension/Event.DownloadFileProgress.kt
new file mode 100644
index 00000000..80bce2dd
--- /dev/null
+++ b/drive/log/domain/src/main/kotlin/me/proton/core/drive/log/domain/extension/Event.DownloadFileProgress.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.log.domain.extension
+
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.announce.event.domain.entity.Event
+import me.proton.core.drive.log.domain.entity.Log
+
+internal fun Event.DownloadFileProgress.toLog(userId: UserId): Log =
+    Log(
+        userId = userId,
+        level = Log.Level.NORMAL,
+        message = "DownloadFileProgress ($downloadingCount, ${progress.value})",
+        creationTime = occurredAt,
+        origin = Log.Origin.EVENT_DOWNLOAD,
+    )
diff --git a/drive/log/domain/src/main/kotlin/me/proton/core/drive/log/domain/handler/LogEventHandler.kt b/drive/log/domain/src/main/kotlin/me/proton/core/drive/log/domain/handler/LogEventHandler.kt
index cdf82eb7..a114cbd5 100644
--- a/drive/log/domain/src/main/kotlin/me/proton/core/drive/log/domain/handler/LogEventHandler.kt
+++ b/drive/log/domain/src/main/kotlin/me/proton/core/drive/log/domain/handler/LogEventHandler.kt
@@ -43,6 +43,7 @@ class LogEventHandler @Inject constructor(
 
     private fun Event.log(userId: UserId): Log? = when (this) {
         is Event.Download -> toLog(userId)
+        is Event.DownloadFileProgress -> toLog(userId)
         is Event.Upload -> toLog(userId)
         is Event.Throwable -> toLog(userId)
         is Event.Network -> toLog(userId)
diff --git a/drive/observability/domain/src/main/kotlin/me/proton/core/drive/observability/domain/metrics/DownloadVerifierAttemptsTotal.kt b/drive/observability/domain/src/main/kotlin/me/proton/core/drive/observability/domain/metrics/DownloadVerifierAttemptsTotal.kt
index c952108f..89e7e54a 100644
--- a/drive/observability/domain/src/main/kotlin/me/proton/core/drive/observability/domain/metrics/DownloadVerifierAttemptsTotal.kt
+++ b/drive/observability/domain/src/main/kotlin/me/proton/core/drive/observability/domain/metrics/DownloadVerifierAttemptsTotal.kt
@@ -21,13 +21,14 @@ package me.proton.core.drive.observability.domain.metrics
 import io.swagger.v3.oas.annotations.media.Schema
 import kotlinx.serialization.Required
 import kotlinx.serialization.Serializable
+import me.proton.core.drive.observability.domain.metrics.common.BooleanStatus
 import me.proton.core.observability.domain.entity.SchemaId
 
 typealias StringBuckets = String
 
 @Serializable
 @Schema(description = "Drive file download verification")
-@SchemaId("https://proton.me/drive_download_verifier_attempts_total_v1.schema.json")
+@SchemaId("https://proton.me/drive_download_verifier_attempts_total_v2.schema.json")
 data class DownloadVerifierAttemptsTotal(
     override val Labels: LabelsData,
     @Required override val Value: Long = 1,
@@ -37,6 +38,7 @@ data class DownloadVerifierAttemptsTotal(
     data class LabelsData(
         val result: ResultStatusWithSkipped,
         val fileSize: StringBuckets,
+        val checksumVerified: BooleanStatus,
     )
 
     @Suppress("EnumEntryName")
diff --git a/drive/photo/data/src/main/kotlin/me/proton/core/drive/photo/data/db/dao/AlbumPhotoListingDao.kt b/drive/photo/data/src/main/kotlin/me/proton/core/drive/photo/data/db/dao/AlbumPhotoListingDao.kt
index 6173260e..2d541241 100644
--- a/drive/photo/data/src/main/kotlin/me/proton/core/drive/photo/data/db/dao/AlbumPhotoListingDao.kt
+++ b/drive/photo/data/src/main/kotlin/me/proton/core/drive/photo/data/db/dao/AlbumPhotoListingDao.kt
@@ -104,7 +104,7 @@ abstract class AlbumPhotoListingDao : BaseDao<AlbumPhotoListingEntity>() {
     }
 
     @Query(ALBUM_PHOTO_LISTING_ASC)
-    internal abstract suspend fun getAlbumPhotoListingsAsc(
+    protected abstract suspend fun getAlbumPhotoListingsAsc(
         userId: UserId,
         volumeId: String,
         albumId: String,
@@ -114,7 +114,7 @@ abstract class AlbumPhotoListingDao : BaseDao<AlbumPhotoListingEntity>() {
     ): List<AlbumPhotoListingWithFileProperties>
 
     @Query(ALBUM_PHOTO_LISTING_ASC)
-    internal abstract fun getAlbumPhotoListingsAscFlow(
+    protected abstract fun getAlbumPhotoListingsAscFlow(
         userId: UserId,
         volumeId: String,
         albumId: String,
@@ -124,7 +124,7 @@ abstract class AlbumPhotoListingDao : BaseDao<AlbumPhotoListingEntity>() {
     ): Flow<List<AlbumPhotoListingWithFileProperties>>
 
     @Query(ALBUM_PHOTO_LISTING_DESC)
-    internal abstract suspend fun getAlbumPhotoListingsDesc(
+    protected abstract suspend fun getAlbumPhotoListingsDesc(
         userId: UserId,
         volumeId: String,
         albumId: String,
@@ -134,7 +134,7 @@ abstract class AlbumPhotoListingDao : BaseDao<AlbumPhotoListingEntity>() {
     ): List<AlbumPhotoListingWithFileProperties>
 
     @Query(ALBUM_PHOTO_LISTING_DESC)
-    internal abstract fun getAlbumPhotoListingsDescFlow(
+    protected abstract fun getAlbumPhotoListingsDescFlow(
         userId: UserId,
         volumeId: String,
         albumId: String,
diff --git a/drive/photo/data/src/main/kotlin/me/proton/core/drive/photo/data/db/dao/PhotoListingDao.kt b/drive/photo/data/src/main/kotlin/me/proton/core/drive/photo/data/db/dao/PhotoListingDao.kt
index e3d9f985..dc8c938a 100644
--- a/drive/photo/data/src/main/kotlin/me/proton/core/drive/photo/data/db/dao/PhotoListingDao.kt
+++ b/drive/photo/data/src/main/kotlin/me/proton/core/drive/photo/data/db/dao/PhotoListingDao.kt
@@ -156,36 +156,6 @@ abstract class PhotoListingDao : BaseDao<PhotoListingEntity>() {
     @Query("DELETE FROM PhotoListingEntity WHERE user_id = :userId AND volume_id = :volumeId")
     abstract suspend fun deleteAll(userId: UserId, volumeId: String)
 
-    @Query(
-        """
-            WITH listing AS (
-                SELECT
-                    ple.user_id,
-                    ple.volume_id,
-                    ple.share_id,
-                    ple.id,
-                    ple.capture_time as capture_time,
-                    ple.hash,
-                    ple.content_hash,
-                    lfpe.revision_id,
-                    lfpe.thumbnail_id_default
-                FROM PhotoListingEntity ple
-                LEFT JOIN LinkFilePropertiesEntity lfpe ON
-                    ple.user_id = lfpe.file_user_id AND
-                    ple.share_id = lfpe.file_share_id AND
-                    ple.id = lfpe.file_link_id
-            )
-            SELECT capture_time, typeof(capture_time) as type FROM listing
-            WHERE capture_time IS NULL OR typeof(capture_time) != 'integer'
-        """
-    )
-    abstract suspend fun getInvalidCaptureTimes(): List<InvalidCaptureTime>
-
-    data class InvalidCaptureTime(
-        val captureTime: Long?,
-        val type: String,
-    )
-
     private companion object{
         const val PHOTO_LISTING_WITH_FILE_PROPERTIES_ASC = """
             SELECT 
diff --git a/drive/photo/domain/src/main/kotlin/me/proton/core/drive/photo/domain/usecase/FetchAllPhotoListings.kt b/drive/photo/domain/src/main/kotlin/me/proton/core/drive/photo/domain/usecase/FetchAllPhotoListings.kt
index 3e9cf28c..fefc6f38 100644
--- a/drive/photo/domain/src/main/kotlin/me/proton/core/drive/photo/domain/usecase/FetchAllPhotoListings.kt
+++ b/drive/photo/domain/src/main/kotlin/me/proton/core/drive/photo/domain/usecase/FetchAllPhotoListings.kt
@@ -20,7 +20,9 @@ package me.proton.core.drive.photo.domain.usecase
 
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.link.domain.entity.FileId
+import me.proton.core.drive.link.domain.entity.PhotoTag
 import me.proton.core.drive.photo.domain.entity.PhotoListing
+import me.proton.core.drive.share.domain.entity.ShareId
 import me.proton.core.drive.volume.domain.entity.VolumeId
 
 interface FetchAllPhotoListings {
@@ -30,4 +32,13 @@ interface FetchAllPhotoListings {
         pageSize: Int,
         linkId: FileId? = null,
     ): Result<List<PhotoListing>>
+
+    suspend operator fun invoke(
+        userId: UserId,
+        volumeId: VolumeId,
+        shareId: ShareId,
+        tag: PhotoTag? = null,
+        initialPageKey: String? = null,
+        postPageProcess: suspend (nextKey: String?, isComplete: Boolean, pageCount: Int) -> Unit,
+    ): Result<Unit>
 }
diff --git a/drive/preview/build.gradle.kts b/drive/preview/build.gradle.kts
index 089867fb..0e9adaf2 100644
--- a/drive/preview/build.gradle.kts
+++ b/drive/preview/build.gradle.kts
@@ -28,7 +28,6 @@ driveModule(
     hilt = true,
     compose = true,
     i18n = true,
-    kapt = true,
     showkase = true,
 ) {
     implementation(project(":drive:base:data"))
diff --git a/drive/preview/src/main/kotlin/me/proton/core/drive/files/preview/presentation/component/Preview.kt b/drive/preview/src/main/kotlin/me/proton/core/drive/files/preview/presentation/component/Preview.kt
index a6632245..f3b0f6a8 100644
--- a/drive/preview/src/main/kotlin/me/proton/core/drive/files/preview/presentation/component/Preview.kt
+++ b/drive/preview/src/main/kotlin/me/proton/core/drive/files/preview/presentation/component/Preview.kt
@@ -184,6 +184,7 @@ fun Preview(
                     }
                     .testTag(PreviewComponentTestTag.screen),
                 navigationIcon = painterResource(id = viewState.navigationIconResId),
+                navigationContentDescription = viewState.navigationContentDescription,
                 onNavigationIcon = { viewEvent.onTopAppBarNavigation() },
                 title = item?.title ?: "",
                 isTitleEncrypted = item?.isTitleEncrypted ?: false,
@@ -619,6 +620,7 @@ fun PreviewPreviewLoadingState() {
             Preview(
                 viewState = PreviewViewState(
                     navigationIconResId = CorePresentation.drawable.ic_proton_arrow_back,
+                    navigationContentDescription = null,
                     isFullscreen = flowOf(true),
                     currentIndex = 0,
                     previewContentState = PreviewContentState.Content,
diff --git a/drive/preview/src/main/kotlin/me/proton/core/drive/files/preview/presentation/component/PreviewEmpty.kt b/drive/preview/src/main/kotlin/me/proton/core/drive/files/preview/presentation/component/PreviewEmpty.kt
index 1686e5c2..7a68d412 100644
--- a/drive/preview/src/main/kotlin/me/proton/core/drive/files/preview/presentation/component/PreviewEmpty.kt
+++ b/drive/preview/src/main/kotlin/me/proton/core/drive/files/preview/presentation/component/PreviewEmpty.kt
@@ -48,6 +48,7 @@ fun PreviewEmpty(
     ) {
         TopAppBar(
             navigationIcon = painterResource(id = CorePresentation.drawable.ic_arrow_back),
+            navigationContentDescription = stringResource(I18N.string.common_back_action),
             onNavigationIcon = navigateBack,
             title = "",
             modifier = Modifier.statusBarsPadding()
diff --git a/drive/preview/src/main/kotlin/me/proton/core/drive/files/preview/presentation/component/state/PreviewViewState.kt b/drive/preview/src/main/kotlin/me/proton/core/drive/files/preview/presentation/component/state/PreviewViewState.kt
index 4c89a278..1adbc81b 100644
--- a/drive/preview/src/main/kotlin/me/proton/core/drive/files/preview/presentation/component/state/PreviewViewState.kt
+++ b/drive/preview/src/main/kotlin/me/proton/core/drive/files/preview/presentation/component/state/PreviewViewState.kt
@@ -24,6 +24,7 @@ import me.proton.core.drive.base.domain.entity.FileTypeCategory
 @Immutable
 data class PreviewViewState(
     val navigationIconResId: Int,
+    val navigationContentDescription: String?,
     val isFullscreen: Flow<Boolean>,
     val previewContentState: PreviewContentState,
     val items: List<Item>,
diff --git a/drive/settings/build.gradle.kts b/drive/settings/build.gradle.kts
index dcfe4341..6eb5ba97 100644
--- a/drive/settings/build.gradle.kts
+++ b/drive/settings/build.gradle.kts
@@ -27,7 +27,6 @@ android {
 driveModule(
     compose = true,
     i18n = true,
-    kapt = true,
     showkase = true,
 ) {
     implementation(project(":drive:base:presentation"))
diff --git a/drive/settings/src/main/java/me/proton/core/drive/settings/presentation/Settings.kt b/drive/settings/src/main/java/me/proton/core/drive/settings/presentation/Settings.kt
index 777124d9..27fa11f0 100644
--- a/drive/settings/src/main/java/me/proton/core/drive/settings/presentation/Settings.kt
+++ b/drive/settings/src/main/java/me/proton/core/drive/settings/presentation/Settings.kt
@@ -81,6 +81,7 @@ fun Settings(
     Column(modifier) {
         TopAppBar(
             navigationIcon = painterResource(id = viewState.navigationIcon),
+            navigationContentDescription = viewState.navigationContentDescription,
             onNavigationIcon = viewEvent.navigateBack,
             title = stringResource(id = I18N.string.common_settings),
         )
@@ -215,6 +216,7 @@ private fun SettingsPreview() {
             modifier = Modifier.background(MaterialTheme.colors.background),
             viewState = SettingsViewState(
                 CorePresentation.drawable.ic_proton_arrow_up,
+                null,
                 I18N.string.common_app,
                 "1.0.0",
                 listOf(
diff --git a/drive/settings/src/main/java/me/proton/core/drive/settings/presentation/component/DefaultHomeTab.kt b/drive/settings/src/main/java/me/proton/core/drive/settings/presentation/component/DefaultHomeTab.kt
index feb8d83e..fa899206 100644
--- a/drive/settings/src/main/java/me/proton/core/drive/settings/presentation/component/DefaultHomeTab.kt
+++ b/drive/settings/src/main/java/me/proton/core/drive/settings/presentation/component/DefaultHomeTab.kt
@@ -60,6 +60,7 @@ fun DefaultHomeTab(
     Column(modifier = modifier) {
         TopAppBar(
             navigationIcon = painterResource(id = CorePresentation.drawable.ic_arrow_back),
+            navigationContentDescription = stringResource(I18N.string.common_back_action),
             onNavigationIcon = navigateBack,
             title = title,
             modifier = Modifier.statusBarsPadding(),
diff --git a/drive/settings/src/main/java/me/proton/core/drive/settings/presentation/state/SettingsViewState.kt b/drive/settings/src/main/java/me/proton/core/drive/settings/presentation/state/SettingsViewState.kt
index 080e51de..7cd6ecb8 100644
--- a/drive/settings/src/main/java/me/proton/core/drive/settings/presentation/state/SettingsViewState.kt
+++ b/drive/settings/src/main/java/me/proton/core/drive/settings/presentation/state/SettingsViewState.kt
@@ -25,6 +25,7 @@ import kotlin.time.Duration
 
 data class SettingsViewState(
     @DrawableRes val navigationIcon: Int,
+    val navigationContentDescription: String?,
     @StringRes val appNameResId: Int,
     val appVersion: String,
     val legalLinks: List<LegalLink>,
diff --git a/drive/sorting/domain/src/main/kotlin/me/proton/core/drive/sorting/domain/usecase/UpdateSorting.kt b/drive/sorting/domain/src/main/kotlin/me/proton/core/drive/sorting/domain/usecase/UpdateSorting.kt
index 9793f788..06fe8ef0 100644
--- a/drive/sorting/domain/src/main/kotlin/me/proton/core/drive/sorting/domain/usecase/UpdateSorting.kt
+++ b/drive/sorting/domain/src/main/kotlin/me/proton/core/drive/sorting/domain/usecase/UpdateSorting.kt
@@ -19,6 +19,7 @@
 package me.proton.core.drive.sorting.domain.usecase
 
 import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.sorting.domain.entity.Sorting
 import me.proton.core.drive.sorting.domain.repository.SortingRepository
 import javax.inject.Inject
@@ -26,6 +27,7 @@ import javax.inject.Inject
 class UpdateSorting @Inject constructor(
     private val repository: SortingRepository,
 ) {
-    suspend operator fun invoke(userId: UserId, sorting: Sorting) =
+    suspend operator fun invoke(userId: UserId, sorting: Sorting) = coRunCatching {
         repository.updateSorting(userId, sorting)
+    }
 }
diff --git a/drive/test/build.gradle.kts b/drive/test/build.gradle.kts
index 5f8a008f..ab9e4f47 100644
--- a/drive/test/build.gradle.kts
+++ b/drive/test/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
     id("com.android.library")
 }
 apply(plugin = "kotlin-android")
-apply(plugin = "kotlin-kapt")
+apply(plugin = "com.google.devtools.ksp")
 apply(plugin = "kotlinx-serialization")
 
 android {
@@ -34,11 +34,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    (this as ExtensionAware).extensions.configure<org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions>(
-        "kotlinOptions"
-    ) {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
 
     sourceSets {
         getByName("test").resources.srcDirs(File(rootDir, "drive/test/resources"))
@@ -46,6 +41,12 @@ android {
 
 }
 
+extensions.configure<org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension> {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+    }
+}
+
 dependencies {
     api(libs.core.domain)
     api(libs.core.account.dagger)
@@ -87,13 +88,13 @@ dependencies {
 
     implementation(libs.dagger.hilt.android)
     implementation(libs.dagger.hilt.android.testing)
-    add("kapt", libs.dagger.hilt.compiler)
-    add("kapt", libs.androidx.hilt.compiler)
+    add("ksp", libs.dagger.hilt.compiler)
+    add("ksp", libs.androidx.hilt.compiler)
 
     api(libs.androidx.test.core.ktx)
     api(libs.junit)
 
     testImplementation(libs.robolectric)
     testImplementation(libs.dagger.hilt.android.testing)
-    add("kaptTest", libs.dagger.hilt.compiler)
+    add("kspTest", libs.dagger.hilt.compiler)
 }
diff --git a/drive/test/src/main/kotlin/me/proton/core/drive/test/di/ApplicationModule.kt b/drive/test/src/main/kotlin/me/proton/core/drive/test/di/ApplicationModule.kt
index 5e192ed9..ad82c1c7 100644
--- a/drive/test/src/main/kotlin/me/proton/core/drive/test/di/ApplicationModule.kt
+++ b/drive/test/src/main/kotlin/me/proton/core/drive/test/di/ApplicationModule.kt
@@ -41,10 +41,12 @@ import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.provider.ProtonDriveClientProvider
 import me.proton.core.drive.base.domain.provider.ProtonPhotosClientProvider
 import me.proton.core.drive.base.domain.repository.ClientUidRepository
+import me.proton.core.drive.link.domain.provider.ProtonSdkClientProvider
 import me.proton.core.drive.test.TestConfigurationProvider
 import me.proton.core.drive.test.handler.MemoryEventHandler
 import me.proton.core.drive.test.provider.TestProtonDriveClientProvider
 import me.proton.core.drive.test.provider.TestProtonPhotosClientProvider
+import me.proton.core.drive.test.provider.TestProtonSdkClientProvider
 import me.proton.core.drive.test.repository.TestClientUidRepository
 import javax.inject.Singleton
 
@@ -117,4 +119,8 @@ abstract class ApplicationBindsModule {
     @Binds
     @Singleton
     abstract fun bindsAppProtonPhotosClientProvider(impl: TestProtonPhotosClientProvider): ProtonPhotosClientProvider
+
+    @Binds
+    @Singleton
+    abstract fun bindsAppProtonSdkClientProvider(impl: TestProtonSdkClientProvider): ProtonSdkClientProvider
 }
diff --git a/drive/test/src/main/kotlin/me/proton/core/drive/test/provider/TestProtonSdkClientProvider.kt b/drive/test/src/main/kotlin/me/proton/core/drive/test/provider/TestProtonSdkClientProvider.kt
new file mode 100644
index 00000000..171aa1c0
--- /dev/null
+++ b/drive/test/src/main/kotlin/me/proton/core/drive/test/provider/TestProtonSdkClientProvider.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.test.provider
+
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.domain.provider.ProtonPhotosClientProvider
+import me.proton.core.drive.link.domain.entity.LinkId
+import me.proton.core.drive.link.domain.provider.ProtonSdkClientProvider
+import me.proton.core.drive.volume.domain.entity.Volume
+import me.proton.core.drive.volume.domain.entity.VolumeId
+import me.proton.drive.sdk.ProtonPhotosClient
+import me.proton.drive.sdk.ProtonSdkClient
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TestProtonSdkClientProvider @Inject constructor() : ProtonSdkClientProvider {
+    override suspend fun getOrCreate(linkId: LinkId): Result<ProtonSdkClient> {
+        error("Cannot use SDK in test")
+    }
+
+    override suspend fun getOrCreate(
+        userId: UserId,
+        volumeType: Volume.Type?,
+    ): Result<ProtonSdkClient> {
+        error("Cannot use SDK in test")
+    }
+
+    override suspend fun getOrCreate(
+        userId: UserId,
+        volumeId: VolumeId,
+    ): Result<ProtonSdkClient> {
+        error("Cannot use SDK in test")
+    }
+
+}
diff --git a/drive/test/src/main/kotlin/me/proton/core/drive/test/usecase/TestIntegrityMetricsNotifier.kt b/drive/test/src/main/kotlin/me/proton/core/drive/test/usecase/TestIntegrityMetricsNotifier.kt
index b6ec5f82..07e5983c 100644
--- a/drive/test/src/main/kotlin/me/proton/core/drive/test/usecase/TestIntegrityMetricsNotifier.kt
+++ b/drive/test/src/main/kotlin/me/proton/core/drive/test/usecase/TestIntegrityMetricsNotifier.kt
@@ -26,6 +26,7 @@ class TestIntegrityMetricsNotifier @Inject constructor(): IntegrityMetricsNotifi
     override suspend fun downloadVerifier(
         fileSize: Bytes,
         isSuccess: Boolean,
+        checksumVerified: Boolean,
         throwable: Throwable?
     ) {
         // do nothing
diff --git a/drive/thumbnail/domain/src/main/kotlin/me/proton/core/drive/thumbnail/domain/usecase/GetThumbnailSdk.kt b/drive/thumbnail/domain/src/main/kotlin/me/proton/core/drive/thumbnail/domain/usecase/GetThumbnailSdk.kt
index a9537fc8..e56a8fbc 100644
--- a/drive/thumbnail/domain/src/main/kotlin/me/proton/core/drive/thumbnail/domain/usecase/GetThumbnailSdk.kt
+++ b/drive/thumbnail/domain/src/main/kotlin/me/proton/core/drive/thumbnail/domain/usecase/GetThumbnailSdk.kt
@@ -24,7 +24,6 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.withIndex
 import me.proton.core.domain.entity.UserId
-import me.proton.core.drive.base.domain.entity.NodeUid
 import me.proton.core.drive.base.domain.log.LogTag.THUMBNAIL
 import me.proton.core.drive.base.domain.provider.ProtonDriveClientProvider
 import me.proton.core.drive.base.domain.provider.ProtonPhotosClientProvider
@@ -33,11 +32,13 @@ import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.drivelink.domain.usecase.GetVolumeType
 import me.proton.core.drive.file.base.domain.entity.ThumbnailType
 import me.proton.core.drive.link.domain.entity.FileId
+import me.proton.core.drive.link.domain.extension.nodeUid
 import me.proton.core.drive.link.domain.extension.userId
+import me.proton.core.drive.link.domain.provider.ProtonSdkClientProvider
 import me.proton.core.drive.volume.domain.entity.Volume
 import me.proton.core.drive.volume.domain.entity.VolumeId
 import me.proton.core.util.kotlin.CoreLogger
-import me.proton.drive.sdk.Uid
+import me.proton.drive.sdk.entity.NodeUid
 import java.util.concurrent.atomic.AtomicInteger
 import java.io.InputStream
 import javax.inject.Inject
@@ -48,8 +49,7 @@ import me.proton.drive.sdk.entity.ThumbnailType as SdkThumbnailType
 
 @Singleton
 class GetThumbnailSdk @Inject constructor(
-    private val protonDriveClientProvider: ProtonDriveClientProvider,
-    private val protonPhotosClientProvider: ProtonPhotosClientProvider,
+    private val protonSdkClientProvider: ProtonSdkClientProvider,
     private val getVolumeType: GetVolumeType,
 ) {
     private data class BatchKey(
@@ -73,36 +73,27 @@ class GetThumbnailSdk @Inject constructor(
         fun logThumbnail(message: String) {
             CoreLogger.d(THUMBNAIL, "Batch[$batchId/${key.type}] $message")
         }
-        val shortUids = uids.map { it.takeLast(UID_LOG_LENGTH) }
-        when (key.volumeType) {
-            Volume.Type.PHOTO -> {
-                logThumbnail("photos: $shortUids")
-                protonPhotosClientProvider
-                    .getOrCreate(key.userId).getOrThrow()
-                    .enumerateThumbnails(photoUids = uids, type = key.type)
+        val shortUids = uids.map { it.value.takeLast(UID_LOG_LENGTH) }
+        logThumbnail("${key.volumeType}: $shortUids")
+        protonSdkClientProvider
+            .getOrCreate(key.userId, key.volumeType)
+            .getOrThrow()
+            .enumerateThumbnails(
+                nodeUids = uids,
+                type = key.type
+            ).withIndex().map { (index, thumbnail) ->
+                val status = if (thumbnail.result.isSuccess) {
+                    "Success"
+                } else {
+                    "Failure(${thumbnail.result.exceptionOrNull()?.message})"
+                }
+                logThumbnail(
+                    "(${index + 1}/${uids.size}) received: ${
+                        thumbnail.uid.value.takeLast(UID_LOG_LENGTH)
+                    } in $status"
+                )
+                thumbnail.uid to thumbnail.result.map { bytes -> bytes.inputStream() }
             }
-
-            Volume.Type.REGULAR -> {
-                logThumbnail("drive: $shortUids")
-                protonDriveClientProvider
-                    .getOrCreate(key.userId).getOrThrow()
-                    .enumerateThumbnails(fileUids = uids, type = key.type)
-            }
-
-            else -> error("Cannot get thumbnail for volume type: ${key.volumeType}")
-        }.withIndex().map { (index, thumbnail) ->
-            val status = if (thumbnail.result.isSuccess) {
-                "Success"
-            } else {
-                "Failure(${thumbnail.result.exceptionOrNull()?.message})"
-            }
-            logThumbnail(
-                "(${index + 1}/${uids.size}) received: ${
-                    thumbnail.uid.takeLast(UID_LOG_LENGTH)
-                } in $status"
-            )
-            thumbnail.uid to thumbnail.result.map { bytes -> bytes.inputStream() }
-        }
     }
 
     suspend operator fun invoke(
@@ -116,7 +107,7 @@ class GetThumbnailSdk @Inject constructor(
                 type = thumbnailType.toSdkType(),
                 volumeType = getVolumeType(fileId).getOrThrow(),
             ),
-            item = Uid.makeNodeUid(volumeId = volumeId.id, nodeId = fileId.id)
+            item = fileId.nodeUid(volumeId)
         )
     }
 }
diff --git a/drive/thumbnail/presentation/src/main/kotlin/me/proton/core/drive/thumbnail/presentation/extension/ThumbnailVO.kt b/drive/thumbnail/presentation/src/main/kotlin/me/proton/core/drive/thumbnail/presentation/extension/ThumbnailVO.kt
index 244adfd7..f616bebe 100644
--- a/drive/thumbnail/presentation/src/main/kotlin/me/proton/core/drive/thumbnail/presentation/extension/ThumbnailVO.kt
+++ b/drive/thumbnail/presentation/src/main/kotlin/me/proton/core/drive/thumbnail/presentation/extension/ThumbnailVO.kt
@@ -29,7 +29,7 @@ import coil.size.Size
 import me.proton.core.drive.thumbnail.presentation.entity.ThumbnailVO
 import me.proton.core.drive.thumbnail.presentation.painter.ThumbnailPainterWrapper
 
-val ThumbnailVO.cacheKey: String get() = "${revisionId}_${thumbnailId.type}"
+val ThumbnailVO.cacheKey: String get() = "$volumeId-$revisionId-${thumbnailId.type}"
 
 fun ThumbnailVO.preCache(context: Context, imageLoader: ImageLoader) = imageLoader.enqueue(
     request = ImageRequest.Builder(context)
@@ -42,8 +42,8 @@ fun ThumbnailVO.preCache(context: Context, imageLoader: ImageLoader) = imageLoad
 fun ThumbnailVO.painter() = ThumbnailPainterWrapper(
     painter = rememberAsyncImagePainter(
         ImageRequest.Builder(LocalContext.current)
-            .scale(Scale.FILL)
             .data(this)
+            .scale(Scale.FILL)
             .size(Size.ORIGINAL)
             .build()
     )
diff --git a/drive/trash/data-test/src/main/kotlin/me/proton/core/drive/trash/data/test/manager/StubbedTrashManager.kt b/drive/trash/data-test/src/main/kotlin/me/proton/core/drive/trash/data/test/manager/StubbedTrashManager.kt
index 650eeb1e..52b5430d 100644
--- a/drive/trash/data-test/src/main/kotlin/me/proton/core/drive/trash/data/test/manager/StubbedTrashManager.kt
+++ b/drive/trash/data-test/src/main/kotlin/me/proton/core/drive/trash/data/test/manager/StubbedTrashManager.kt
@@ -39,7 +39,6 @@ import me.proton.core.drive.link.domain.entity.LinkId
 import me.proton.core.drive.link.domain.repository.LinkRepository
 import me.proton.core.drive.linktrash.domain.repository.LinkTrashRepository
 import me.proton.core.drive.share.domain.usecase.GetMainShare
-import me.proton.core.drive.share.domain.usecase.GetShare
 import me.proton.core.drive.trash.data.manager.worker.EmptyTrashSuccessWorker
 import me.proton.core.drive.trash.data.manager.worker.EmptyTrashWorker
 import me.proton.core.drive.trash.data.manager.worker.PermanentlyDeleteFileNodesWorker
@@ -48,6 +47,7 @@ import me.proton.core.drive.trash.data.manager.worker.TrashFileNodesWorker
 import me.proton.core.drive.trash.domain.TrashManager
 import me.proton.core.drive.trash.domain.repository.DriveTrashRepository
 import me.proton.core.drive.volume.domain.entity.VolumeId
+import me.proton.core.drive.volume.domain.usecase.GetActiveVolumes
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -60,8 +60,8 @@ class StubbedTrashManager @Inject constructor(
     private val updateEventAction: UpdateEventAction,
     private val linkRepository: LinkRepository,
     private val handleOnDeleteEvent: HandleOnDeleteEvent,
-    private val getShare: GetShare,
     private val getMainShare: GetMainShare,
+    private val getActiveVolumes: GetActiveVolumes,
 ) : TrashManager {
     private val context by lazy { ApplicationProvider.getApplicationContext<Context>() }
 
@@ -85,6 +85,7 @@ class StubbedTrashManager @Inject constructor(
                     updateEventAction = updateEventAction,
                     linkRepository = linkRepository,
                     handleOnDeleteEvent = handleOnDeleteEvent,
+                    getActiveVolumes = getActiveVolumes,
                     appContext = appContext,
                     params = workerParameters,
                 )
diff --git a/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/manager/worker/TrashFileNodesWorker.kt b/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/manager/worker/TrashFileNodesWorker.kt
index 56fd7852..cc1bbaa3 100644
--- a/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/manager/worker/TrashFileNodesWorker.kt
+++ b/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/manager/worker/TrashFileNodesWorker.kt
@@ -33,6 +33,7 @@ import me.proton.core.drive.base.data.extension.log
 import me.proton.core.drive.base.data.workmanager.addTags
 import me.proton.core.drive.base.domain.api.ProtonApiCode.NOT_EXISTS
 import me.proton.core.drive.base.domain.extension.onProtonHttpException
+import me.proton.core.drive.base.domain.extension.toResult
 import me.proton.core.drive.base.domain.log.LogTag.TRASH
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
 import me.proton.core.drive.base.domain.util.coRunCatching
@@ -51,6 +52,7 @@ import me.proton.core.drive.trash.data.manager.worker.WorkerKeys.KEY_WORK_ID
 import me.proton.core.drive.trash.domain.notification.TrashFilesExtra
 import me.proton.core.drive.trash.domain.repository.DriveTrashRepository
 import me.proton.core.drive.volume.domain.entity.VolumeId
+import me.proton.core.drive.volume.domain.usecase.GetActiveVolumes
 import java.util.concurrent.TimeUnit
 import me.proton.core.drive.i18n.R as I18N
 
@@ -62,6 +64,7 @@ class TrashFileNodesWorker @AssistedInject constructor(
     private val updateEventAction: UpdateEventAction,
     private val linkRepository: LinkRepository,
     private val handleOnDeleteEvent: HandleOnDeleteEvent,
+    private val getActiveVolumes: GetActiveVolumes,
     @Assisted appContext: Context,
     @Assisted params: WorkerParameters,
 ) : AbstractMultiResponseCoroutineWorker(linkTrashRepository, appContext, params) {
@@ -76,6 +79,17 @@ class TrashFileNodesWorker @AssistedInject constructor(
         }
 
     override suspend fun handleSuccesses(linkIds: List<LinkId>) {
+        val activeVolumes = getActiveVolumes(userId)
+            .toResult()
+            .onFailure { error ->
+                error.log(
+                    tag = TRASH,
+                    message = "Failed getting active volumes",
+                )
+            }
+            .getOrNull()
+            ?.map { volume -> volume.id }
+            ?: emptyList()
         linkTrashRepository.insertOrUpdateTrashState(volumeId, linkIds, TrashState.TRASHED)
         broadcastMessages(
             userId = userId,
@@ -85,7 +99,12 @@ class TrashFileNodesWorker @AssistedInject constructor(
                 linkIds.size,
             ),
             type = BroadcastMessage.Type.SUCCESS,
-            extra = TrashFilesExtra(userId, volumeId, linkIds)
+            extra = TrashFilesExtra(
+                userId = userId,
+                volumeId = volumeId,
+                links = linkIds,
+                allowsUndo = volumeId in activeVolumes,
+            )
         )
     }
 
diff --git a/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/repository/DriveTrashRepositoryImpl.kt b/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/repository/DriveTrashRepositoryImpl.kt
index ef1113eb..4429fc75 100644
--- a/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/repository/DriveTrashRepositoryImpl.kt
+++ b/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/repository/DriveTrashRepositoryImpl.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023 Proton AG.
+ * Copyright (c) 2026 Proton AG.
  * This file is part of Proton Core.
  *
  * Proton Core is free software: you can redistribute it and/or modify
@@ -18,71 +18,52 @@
 
 package me.proton.core.drive.trash.data.repository
 
+import me.proton.core.domain.arch.DataResult
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.base.domain.entity.SaveAction
-import me.proton.core.drive.base.domain.extension.toResult
-import me.proton.core.drive.base.domain.provider.ConfigurationProvider
-import me.proton.core.drive.base.domain.util.coRunCatching
-import me.proton.core.drive.link.data.api.extension.associateResults
-import me.proton.core.drive.link.data.api.response.LinkResponses
 import me.proton.core.drive.link.domain.entity.Link
 import me.proton.core.drive.link.domain.entity.LinkId
-import me.proton.core.drive.link.domain.repository.LinkRepository
-import me.proton.core.drive.link.domain.usecase.InsertOrUpdateLinks
-import me.proton.core.drive.link.domain.usecase.SortLinksByParents
-import me.proton.core.drive.linktrash.data.db.LinkTrashDatabase
-import me.proton.core.drive.linktrash.domain.entity.TrashState
 import me.proton.core.drive.linktrash.domain.repository.LinkTrashRepository
-import me.proton.core.drive.share.domain.entity.ShareId
-import me.proton.core.drive.share.domain.usecase.GetShare
-import me.proton.core.drive.trash.data.api.datasource.TrashApiDataSource
 import me.proton.core.drive.trash.domain.repository.DriveTrashRepository
-import me.proton.core.drive.volume.data.api.VolumeApiDataSource
+import me.proton.core.drive.trash.domain.usecase.UseSdkForTrash
 import me.proton.core.drive.volume.domain.entity.VolumeId
 import javax.inject.Inject
 
 class DriveTrashRepositoryImpl @Inject constructor(
-    private val apiDataSource: TrashApiDataSource,
-    private val volumeApi: VolumeApiDataSource,
-    private val linkRepository: LinkRepository,
+    private val legacy: DriveTrashRepositoryLegacy,
+    private val sdk: DriveTrashRepositorySdk,
+    private val useSdkForTrash: UseSdkForTrash,
     private val linkTrashRepository: LinkTrashRepository,
-    private val db: LinkTrashDatabase,
-    private val configurationProvider: ConfigurationProvider,
-    private val insertOrUpdateLinks: InsertOrUpdateLinks,
-    private val sortLinksByParents: SortLinksByParents,
-    private val getShare: GetShare,
 ) : DriveTrashRepository {
 
     override suspend fun sendToTrash(
         userId: UserId,
         volumeId: VolumeId,
         links: List<LinkId>,
-    ) = associateResults(links) {
-        links.batchBy(configurationProvider.apiPageSize) { batch ->
-            apiDataSource.sendToTrash(
-                userId = userId,
-                volumeId = volumeId,
-                linkIds = batch.map { link -> link.id },
-            )
+    ): Map<LinkId, DataResult<Unit>> =
+        if (useSdkForTrash(userId, volumeId).getOrElse { false }) {
+            sdk.sendToTrash(userId, volumeId, links)
+        } else {
+            legacy.sendToTrash(userId, volumeId, links)
         }
-    }
 
     override suspend fun restoreFromTrash(
         userId: UserId,
         volumeId: VolumeId,
         links: List<LinkId>,
-    ) = associateResults(links) {
-        links.batchBy(configurationProvider.apiPageSize) { batch ->
-            apiDataSource.restoreFromTrash(
-                userId = userId,
-                volumeId = volumeId,
-                linkIds = batch.map { link -> link.id },
-            )
+    ): Map<LinkId, DataResult<Unit>> =
+        if (useSdkForTrash(userId, volumeId).getOrElse { false }) {
+            sdk.restoreFromTrash(userId, volumeId, links)
+        } else {
+            legacy.restoreFromTrash(userId, volumeId, links)
         }
-    }
 
     override suspend fun emptyTrash(userId: UserId, volumeId: VolumeId) {
-        volumeApi.emptyTrash(userId, volumeId)
+        if (useSdkForTrash(userId, volumeId).getOrElse { false }) {
+            sdk.emptyTrash(userId, volumeId)
+        } else {
+            legacy.emptyTrash(userId, volumeId)
+        }
         linkTrashRepository.markTrashedLinkAsDeleted(userId, volumeId)
     }
 
@@ -90,59 +71,17 @@ class DriveTrashRepositoryImpl @Inject constructor(
         userId: UserId,
         volumeId: VolumeId,
         links: List<LinkId>,
-    ) = associateResults(links) {
-        links.batchBy(configurationProvider.apiPageSize) { batch ->
-            apiDataSource.deleteItemsFromTrash(
-                userId = userId,
-                volumeId = volumeId,
-                linkIds = batch.map { link -> link.id },
-            )
+    ): Map<LinkId, DataResult<Unit>> =
+        if (useSdkForTrash(userId, volumeId).getOrElse { false }) {
+            sdk.deleteItemsFromTrash(userId, volumeId, links)
+        } else {
+            legacy.deleteItemsFromTrash(userId, volumeId, links)
         }
-    }
 
     override suspend fun fetchTrashContent(
         userId: UserId,
         volumeId: VolumeId,
         pageIndex: Int,
         pageSize: Int,
-    ): Result<Pair<List<Link>, SaveAction>> = coRunCatching {
-        val allParents = mutableSetOf<Link>()
-        val allLinks = mutableSetOf<Link>()
-        val fetchedLinks = mutableSetOf<Link>()
-        volumeApi
-            .getShareTrashes(userId, volumeId.id, pageIndex, pageSize)
-            .forEach { shareTrash ->
-                val cachedLinks = linkRepository.getCachedLinks(userId, shareTrash.shareId, shareTrash.linkIds.toSet())
-                allLinks.addAll(cachedLinks)
-                val notCachedLinkIds = shareTrash.linkIds.toSet() - cachedLinks.map { link -> link.id.id }.toSet()
-                if (notCachedLinkIds.isNotEmpty()) {
-                    val shareId = getShare(ShareId(userId, shareTrash.shareId)).toResult().getOrThrow().id
-                    val (parents, links) = linkRepository.fetchLinks(shareId, notCachedLinkIds).getOrThrow()
-                    allParents.addAll(parents)
-                    allLinks.addAll(links)
-                    fetchedLinks.addAll(links)
-                }
-            }
-        Pair(
-            allLinks.toList(),
-            SaveAction {
-                db.inTransaction {
-                    insertOrUpdateLinks(sortLinksByParents((fetchedLinks + allParents).toSet().toList()))
-                    linkTrashRepository.insertOrUpdateTrashState(
-                        volumeId = volumeId,
-                        linkIds = allLinks.map { link -> link.id },
-                        trashState = TrashState.TRASHED,
-                    )
-                }
-            },
-        )
-    }
-
-    private suspend fun List<LinkId>.batchBy(
-        size: Int,
-        action: suspend (List<LinkId>) -> LinkResponses
-    ) = LinkResponses(
-        code = 0,
-        responses = chunked(size).map { chunk -> action(chunk) }.flatMap { it.responses }
-    )
+    ): Result<Pair<List<Link>, SaveAction>> = legacy.fetchTrashContent(userId, volumeId, pageIndex, pageSize)
 }
diff --git a/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/repository/DriveTrashRepositoryLegacy.kt b/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/repository/DriveTrashRepositoryLegacy.kt
new file mode 100644
index 00000000..43d2eecc
--- /dev/null
+++ b/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/repository/DriveTrashRepositoryLegacy.kt
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2021-2023 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.trash.data.repository
+
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.domain.entity.SaveAction
+import me.proton.core.drive.base.domain.extension.toResult
+import me.proton.core.drive.base.domain.provider.ConfigurationProvider
+import me.proton.core.drive.base.domain.util.coRunCatching
+import me.proton.core.drive.link.data.api.extension.associateResults
+import me.proton.core.drive.link.data.api.response.LinkResponses
+import me.proton.core.drive.link.domain.entity.Link
+import me.proton.core.drive.link.domain.entity.LinkId
+import me.proton.core.drive.link.domain.repository.LinkRepository
+import me.proton.core.drive.link.domain.usecase.InsertOrUpdateLinks
+import me.proton.core.drive.link.domain.usecase.SortLinksByParents
+import me.proton.core.drive.linktrash.data.db.LinkTrashDatabase
+import me.proton.core.drive.linktrash.domain.entity.TrashState
+import me.proton.core.drive.linktrash.domain.repository.LinkTrashRepository
+import me.proton.core.drive.share.domain.entity.ShareId
+import me.proton.core.drive.share.domain.usecase.GetShare
+import me.proton.core.drive.trash.data.api.datasource.TrashApiDataSource
+import me.proton.core.drive.trash.domain.repository.DriveTrashRepository
+import me.proton.core.drive.volume.data.api.VolumeApiDataSource
+import me.proton.core.drive.volume.domain.entity.VolumeId
+import javax.inject.Inject
+
+class DriveTrashRepositoryLegacy @Inject constructor(
+    private val apiDataSource: TrashApiDataSource,
+    private val volumeApi: VolumeApiDataSource,
+    private val linkRepository: LinkRepository,
+    private val linkTrashRepository: LinkTrashRepository,
+    private val db: LinkTrashDatabase,
+    private val configurationProvider: ConfigurationProvider,
+    private val insertOrUpdateLinks: InsertOrUpdateLinks,
+    private val sortLinksByParents: SortLinksByParents,
+    private val getShare: GetShare,
+) : DriveTrashRepository {
+
+    override suspend fun sendToTrash(
+        userId: UserId,
+        volumeId: VolumeId,
+        links: List<LinkId>,
+    ) = associateResults(links) {
+        links.batchBy(configurationProvider.apiPageSize) { batch ->
+            apiDataSource.sendToTrash(
+                userId = userId,
+                volumeId = volumeId,
+                linkIds = batch.map { link -> link.id },
+            )
+        }
+    }
+
+    override suspend fun restoreFromTrash(
+        userId: UserId,
+        volumeId: VolumeId,
+        links: List<LinkId>,
+    ) = associateResults(links) {
+        links.batchBy(configurationProvider.apiPageSize) { batch ->
+            apiDataSource.restoreFromTrash(
+                userId = userId,
+                volumeId = volumeId,
+                linkIds = batch.map { link -> link.id },
+            )
+        }
+    }
+
+    override suspend fun emptyTrash(userId: UserId, volumeId: VolumeId) {
+        volumeApi.emptyTrash(userId, volumeId)
+    }
+
+    override suspend fun deleteItemsFromTrash(
+        userId: UserId,
+        volumeId: VolumeId,
+        links: List<LinkId>,
+    ) = associateResults(links) {
+        links.batchBy(configurationProvider.apiPageSize) { batch ->
+            apiDataSource.deleteItemsFromTrash(
+                userId = userId,
+                volumeId = volumeId,
+                linkIds = batch.map { link -> link.id },
+            )
+        }
+    }
+
+    override suspend fun fetchTrashContent(
+        userId: UserId,
+        volumeId: VolumeId,
+        pageIndex: Int,
+        pageSize: Int,
+    ): Result<Pair<List<Link>, SaveAction>> = coRunCatching {
+        val allParents = mutableSetOf<Link>()
+        val allLinks = mutableSetOf<Link>()
+        val fetchedLinks = mutableSetOf<Link>()
+        volumeApi
+            .getShareTrashes(userId, volumeId.id, pageIndex, pageSize)
+            .forEach { shareTrash ->
+                val cachedLinks = linkRepository.getCachedLinks(userId, shareTrash.shareId, shareTrash.linkIds.toSet())
+                allLinks.addAll(cachedLinks)
+                val notCachedLinkIds = shareTrash.linkIds.toSet() - cachedLinks.map { link -> link.id.id }.toSet()
+                if (notCachedLinkIds.isNotEmpty()) {
+                    val shareId = getShare(ShareId(userId, shareTrash.shareId)).toResult().getOrThrow().id
+                    val (parents, links) = linkRepository.fetchLinks(shareId, notCachedLinkIds).getOrThrow()
+                    allParents.addAll(parents)
+                    allLinks.addAll(links)
+                    fetchedLinks.addAll(links)
+                }
+            }
+        Pair(
+            allLinks.toList(),
+            SaveAction {
+                db.inTransaction {
+                    insertOrUpdateLinks(sortLinksByParents((fetchedLinks + allParents).toSet().toList()))
+                    linkTrashRepository.insertOrUpdateTrashState(
+                        volumeId = volumeId,
+                        linkIds = allLinks.map { link -> link.id },
+                        trashState = TrashState.TRASHED,
+                    )
+                }
+            },
+        )
+    }
+
+    private suspend fun List<LinkId>.batchBy(
+        size: Int,
+        action: suspend (List<LinkId>) -> LinkResponses
+    ) = LinkResponses(
+        code = 0,
+        responses = chunked(size).map { chunk -> action(chunk) }.flatMap { it.responses }
+    )
+}
diff --git a/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/repository/DriveTrashRepositorySdk.kt b/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/repository/DriveTrashRepositorySdk.kt
new file mode 100644
index 00000000..e843cf82
--- /dev/null
+++ b/drive/trash/data/src/main/kotlin/me/proton/core/drive/trash/data/repository/DriveTrashRepositorySdk.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.trash.data.repository
+
+import me.proton.core.domain.arch.DataResult
+import me.proton.core.domain.arch.ResponseSource
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.domain.entity.SaveAction
+import me.proton.core.drive.link.domain.entity.Link
+import me.proton.core.drive.link.domain.entity.LinkId
+import me.proton.core.drive.link.domain.extension.nodeUid
+import me.proton.core.drive.link.domain.provider.ProtonSdkClientProvider
+import me.proton.core.drive.trash.domain.repository.DriveTrashRepository
+import me.proton.core.drive.volume.domain.entity.VolumeId
+import me.proton.drive.sdk.entity.NodeResultPair
+import me.proton.drive.sdk.entity.NodeUid
+import javax.inject.Inject
+
+class DriveTrashRepositorySdk @Inject constructor(
+    private val protonSdkClientProvider: ProtonSdkClientProvider,
+) : DriveTrashRepository {
+    override suspend fun fetchTrashContent(
+        userId: UserId,
+        volumeId: VolumeId,
+        pageIndex: Int,
+        pageSize: Int
+    ): Result<Pair<List<Link>, SaveAction>> {
+        TODO("fetchTrashContent not implemented in sdk")
+    }
+
+    override suspend fun sendToTrash(
+        userId: UserId,
+        volumeId: VolumeId,
+        links: List<LinkId>,
+    ): Map<LinkId, DataResult<Unit>> {
+        val nodeUids = links.associateBy { it.nodeUid(volumeId) }
+        return protonSdkClientProvider.getOrCreate(userId, volumeId).getOrThrow()
+            .trashNodes(nodeUids.keys.toList())
+            .toDataResultMap(nodeUids)
+    }
+
+    override suspend fun restoreFromTrash(
+        userId: UserId,
+        volumeId: VolumeId,
+        links: List<LinkId>,
+    ): Map<LinkId, DataResult<Unit>> {
+        val nodeUids = links.associateBy { it.nodeUid(volumeId) }
+        return protonSdkClientProvider.getOrCreate(userId, volumeId).getOrThrow()
+            .restoreNodes(nodeUids.keys.toList())
+            .toDataResultMap(nodeUids)
+    }
+
+    override suspend fun emptyTrash(userId: UserId, volumeId: VolumeId) {
+        return protonSdkClientProvider.getOrCreate(userId, volumeId).getOrThrow().emptyTrash()
+    }
+
+    override suspend fun deleteItemsFromTrash(
+        userId: UserId,
+        volumeId: VolumeId,
+        links: List<LinkId>,
+    ): Map<LinkId, DataResult<Unit>> {
+        val nodeUids = links.associateBy { it.nodeUid(volumeId) }
+        return protonSdkClientProvider.getOrCreate(userId, volumeId).getOrThrow()
+            .deleteNodes(nodeUids.keys.toList())
+            .toDataResultMap(nodeUids)
+    }
+
+    private fun List<NodeResultPair>.toDataResultMap(nodeUids: Map<NodeUid, LinkId>): Map<LinkId, DataResult<Unit>> =
+        mapNotNull { pair ->
+            nodeUids[pair.nodeUid]?.let { linkId ->
+                linkId to when (pair) {
+                    is NodeResultPair.Success -> DataResult.Success(ResponseSource.Remote, Unit)
+                    is NodeResultPair.Failure -> DataResult.Error.Remote(pair.error.message, pair.error)
+                }
+            }
+        }.toMap()
+}
diff --git a/drive/trash/domain/build.gradle.kts b/drive/trash/domain/build.gradle.kts
index f01525df..69695a78 100644
--- a/drive/trash/domain/build.gradle.kts
+++ b/drive/trash/domain/build.gradle.kts
@@ -33,6 +33,7 @@ driveModule(
     api(project(":drive:link-trash:domain"))
     api(libs.androidx.paging.common)
     implementation(project(":drive:crypto:domain"))
+    implementation(project(":drive:feature-flag:domain"))
     implementation(project(":drive:message-queue:domain"))
     implementation(project(":drive:share:domain"))
 
diff --git a/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/notification/TrashExtraActionProvider.kt b/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/notification/TrashExtraActionProvider.kt
index e0379953..48320851 100644
--- a/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/notification/TrashExtraActionProvider.kt
+++ b/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/notification/TrashExtraActionProvider.kt
@@ -43,10 +43,12 @@ class TrashExtraActionProvider @Inject constructor(
         else -> null
     }
 
-    private fun TrashFilesExtra.provideAction(): ActionProvider.Action = if (exception == null) {
-        ActionProvider.Action(I18N.string.trash_action_undo) {
-            restoreFromTrash(userId, volumeId, links)
-        }
+    private fun TrashFilesExtra.provideAction(): ActionProvider.Action? = if (exception == null) {
+        if (allowsUndo) {
+            ActionProvider.Action(I18N.string.trash_action_undo) {
+                restoreFromTrash(userId, volumeId, links)
+            }
+        } else null // Undo is not allowed, usually if file does not belong to user volumes
     } else {
         ActionProvider.Action(I18N.string.trash_action_retry) {
             sendToTrash(userId, volumeId, links)
diff --git a/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/notification/TrashFilesExtra.kt b/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/notification/TrashFilesExtra.kt
index 792f6615..acc85327 100644
--- a/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/notification/TrashFilesExtra.kt
+++ b/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/notification/TrashFilesExtra.kt
@@ -28,4 +28,5 @@ data class TrashFilesExtra(
     val volumeId: VolumeId,
     val links: List<LinkId>,
     val exception: Exception? = null,
+    val allowsUndo: Boolean = true,
 ) : Serializable
diff --git a/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/usecase/DeleteFromTrash.kt b/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/usecase/DeleteFromTrash.kt
index 2daa1d6f..b0e2c0a0 100644
--- a/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/usecase/DeleteFromTrash.kt
+++ b/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/usecase/DeleteFromTrash.kt
@@ -22,6 +22,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.base.domain.extension.onFailure
 import me.proton.core.drive.base.domain.extension.toResult
+import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.link.domain.entity.LinkId
 import me.proton.core.drive.linktrash.domain.entity.TrashState
 import me.proton.core.drive.linktrash.domain.repository.LinkTrashRepository
@@ -38,12 +39,13 @@ class DeleteFromTrash @Inject constructor(
     private val getShare: GetShare,
 ) {
 
-    suspend operator fun invoke(userId: UserId, linkId: LinkId) =
-        invoke(userId, listOf(linkId))
+    suspend operator fun invoke(userId: UserId, linkId: LinkId) = coRunCatching {
+        invoke(userId, listOf(linkId)).getOrThrow()
+    }
 
-    suspend operator fun invoke(userId: UserId, linkIds: List<LinkId>) {
-        linkIds.groupBy { linkId -> linkId.shareId }.forEach { (share, groupedLinks) ->
-            invoke(userId, share, groupedLinks)
+    suspend operator fun invoke(userId: UserId, linkIds: List<LinkId>) = coRunCatching {
+        linkIds.groupBy { linkId -> linkId.shareId }.forEach { (shareId, groupedLinks) ->
+            invoke(userId, shareId, groupedLinks).getOrThrow()
         }
     }
 
@@ -51,9 +53,9 @@ class DeleteFromTrash @Inject constructor(
         userId: UserId,
         shareId: ShareId,
         linkIds: List<LinkId>,
-    ) {
+    ) = coRunCatching {
         getShare(shareId).toResult().getOrNull()?.let { share ->
-            invoke(userId, share.volumeId, linkIds)
+            invoke(userId, share.volumeId, linkIds).getOrThrow()
         }
     }
 
@@ -61,7 +63,7 @@ class DeleteFromTrash @Inject constructor(
         userId: UserId,
         volumeId: VolumeId,
         linkIds: List<LinkId>,
-    ) {
+    ) = coRunCatching {
         linkTrashRepository.insertOrUpdateTrashState(volumeId, linkIds, TrashState.DELETING)
         trashManager.delete(userId, volumeId, linkIds).onFailure {
             linkTrashRepository.insertOrUpdateTrashState(volumeId, linkIds, TrashState.TRASHED)
diff --git a/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/usecase/SendToTrash.kt b/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/usecase/SendToTrash.kt
index aa291d23..7f3e1e2f 100644
--- a/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/usecase/SendToTrash.kt
+++ b/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/usecase/SendToTrash.kt
@@ -21,6 +21,7 @@ package me.proton.core.drive.trash.domain.usecase
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.base.domain.extension.onFailure
 import me.proton.core.drive.base.domain.extension.toResult
+import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.link.domain.entity.BaseLink
 import me.proton.core.drive.link.domain.entity.LinkId
 import me.proton.core.drive.link.domain.entity.ParentId
@@ -37,18 +38,23 @@ class SendToTrash @Inject constructor(
     private val getShare: GetShare,
 ) {
 
-    suspend operator fun invoke(userId: UserId, link: BaseLink) =
-        invoke(userId, listOf(link))
+    suspend operator fun invoke(userId: UserId, link: BaseLink) = coRunCatching {
+        invoke(userId, listOf(link)).getOrThrow()
+    }
 
-    suspend operator fun invoke(userId: UserId, links: List<BaseLink>) {
+    suspend operator fun invoke(userId: UserId, links: List<BaseLink>) = coRunCatching {
         links.applyGroupedByShareAndParentFolder { parentId, groupedLinks ->
-            invoke(userId, parentId, groupedLinks.map { link -> link.id })
+            invoke(userId, parentId, groupedLinks.map { link -> link.id }).getOrThrow()
         }
     }
 
-    suspend operator fun invoke(userId: UserId, parentId: ParentId, linkIds: List<LinkId>) {
+    suspend operator fun invoke(
+        userId: UserId,
+        parentId: ParentId,
+        linkIds: List<LinkId>,
+    ) = coRunCatching {
         getShare(parentId.shareId).toResult().getOrNull()?.let { share ->
-            invoke(userId, share.volumeId, linkIds)
+            invoke(userId, share.volumeId, linkIds).getOrThrow()
         }
     }
 
@@ -56,7 +62,7 @@ class SendToTrash @Inject constructor(
         userId: UserId,
         volumeId: VolumeId,
         linkIds: List<LinkId>,
-    ) {
+    ) = coRunCatching {
         trashRepository.insertOrUpdateTrashState(volumeId, linkIds, TrashState.TRASHING)
         trashManager.trash(userId, volumeId, linkIds).onFailure {
             trashRepository.removeTrashState(linkIds)
diff --git a/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/usecase/UseSdkForTrash.kt b/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/usecase/UseSdkForTrash.kt
new file mode 100644
index 00000000..219c3965
--- /dev/null
+++ b/drive/trash/domain/src/main/kotlin/me/proton/core/drive/trash/domain/usecase/UseSdkForTrash.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.trash.domain.usecase
+
+import me.proton.core.domain.entity.UserId
+import me.proton.core.drive.base.domain.extension.toResult
+import me.proton.core.drive.base.domain.provider.ConfigurationProvider
+import me.proton.core.drive.base.domain.util.coRunCatching
+import me.proton.core.drive.feature.flag.domain.entity.FeatureFlagId.Companion.driveAndroidSDKTrash
+import me.proton.core.drive.feature.flag.domain.extension.on
+import me.proton.core.drive.feature.flag.domain.usecase.GetFeatureFlag
+import me.proton.core.drive.volume.domain.entity.Volume
+import me.proton.core.drive.volume.domain.entity.VolumeId
+import me.proton.core.drive.volume.domain.usecase.GetVolume
+import javax.inject.Inject
+
+class UseSdkForTrash @Inject constructor(
+    private val configurationProvider: ConfigurationProvider,
+    private val getFeatureFlag: GetFeatureFlag,
+) {
+    suspend operator fun invoke(userId: UserId, volumeId: VolumeId) = coRunCatching {
+        configurationProvider.preferSdkForTrash && getFeatureFlag(driveAndroidSDKTrash(userId)).on
+    }
+}
diff --git a/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/resolver/ContentUriResolver.kt b/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/resolver/ContentUriResolver.kt
index 36e09a76..d7978110 100644
--- a/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/resolver/ContentUriResolver.kt
+++ b/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/resolver/ContentUriResolver.kt
@@ -142,7 +142,14 @@ class ContentUriResolver(
     ): T? = coRunCatching(coroutineContext) {
         with (applicationContext.contentResolver) {
             val uri = Uri.parse(uriString)
-            runCatching { takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION) }
+            runCatching {
+                takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            }.onFailure { error ->
+                error.log(
+                    tag = UPLOAD,
+                    message = "No persistable permission for: $uriString, relying on temporary grant",
+                )
+            }
             block(uri)
         }
     }.onFailure { error ->
diff --git a/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/worker/FileUploadFlow.kt b/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/worker/FileUploadFlow.kt
index ec9cd3ba..92c0319c 100644
--- a/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/worker/FileUploadFlow.kt
+++ b/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/worker/FileUploadFlow.kt
@@ -274,4 +274,34 @@ internal sealed class FileUploadFlow {
             ).enqueue()
     }
 
+    class RecreateFileSdk(
+        private val workManager: WorkManager,
+        private val userId: UserId,
+        override val uploadFileLinkId: Long,
+        private val networkType: NetworkType,
+        private val cleanupWorkers: CleanupWorkers,
+    ) : FileUploadFlow() {
+
+        override suspend fun enqueueWork(uploadTags: List<String>, uriString: String) = workManager
+            .beginWith(
+                CreateNewFileSdkWorker.getWorkRequest(
+                    userId = userId,
+                    uploadFileLinkId = uploadFileLinkId,
+                    uriString = uriString,
+                    networkType = networkType,
+                    tags = uploadTags,
+                )
+            ).then(
+                UploadFileSdkWorker.getWorkRequest(
+                    userId = userId,
+                    uploadFileLinkId = uploadFileLinkId,
+                    uriString = uriString,
+                    networkType = networkType,
+                    tags = uploadTags,
+                )
+            ).then(
+                cleanupWorkers(userId, uploadFileLinkId, uploadTags)
+            ).enqueue()
+    }
+
 }
diff --git a/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/worker/UploadEventWorker.kt b/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/worker/UploadEventWorker.kt
index f12a85a6..a9d27370 100644
--- a/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/worker/UploadEventWorker.kt
+++ b/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/worker/UploadEventWorker.kt
@@ -32,6 +32,7 @@ import dagger.assisted.AssistedInject
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.collectLatest
@@ -91,45 +92,53 @@ class UploadEventWorker @AssistedInject constructor(
         event = Event.TransferData,
     )
 
-    override suspend fun doWork(): Result = supervisorScope {
+    override suspend fun doWork(): Result {
         CoreLogger.d(
             tag = LogTag.NOTIFICATION,
             message = "Starting upload notification event worker",
         )
         setForeground()
         try {
-            val previousIds = mutableSetOf<Long>()
-            combine(getUploadFileLinksWithUriByPriority(
-                userId = userId,
-                states = setOf(
-                    UploadState.CREATING_NEW_FILE,
-                    UploadState.SPLITTING_URI_TO_BLOCKS,
-                    UploadState.EXTRACTING_TAGS,
-                    UploadState.ENCRYPTING_BLOCKS,
-                    UploadState.GETTING_UPLOAD_LINKS,
-                    UploadState.UPLOADING_BLOCKS,
-                    UploadState.UPDATING_REVISION,
-                ),
-                count = configurationProvider.uploadsInParallelPerVolume * 4,
-            ), getUploadFileLinksCount(userId)) { uploadFileLinks, count ->
-                uploadFileLinks to count
+            supervisorScope {
+                val previousIds = mutableSetOf<Long>()
+                val progressJobs = mutableMapOf<Long, Job>()
+                combine(getUploadFileLinksWithUriByPriority(
+                    userId = userId,
+                    states = setOf(
+                        UploadState.CREATING_NEW_FILE,
+                        UploadState.SPLITTING_URI_TO_BLOCKS,
+                        UploadState.EXTRACTING_TAGS,
+                        UploadState.ENCRYPTING_BLOCKS,
+                        UploadState.GETTING_UPLOAD_LINKS,
+                        UploadState.UPLOADING_BLOCKS,
+                        UploadState.UPDATING_REVISION,
+                    ),
+                    count = configurationProvider.uploadsInParallelPerVolume * 4,
+                ), getUploadFileLinksCount(userId)) { uploadFileLinks, count ->
+                    uploadFileLinks to count
+                }
+                    // do not collect forever from database
+                    .takeWhile { (_, count) -> count.totalWithAnnounce != 0 }
+                    .map { (uploadFileLinks, _) -> uploadFileLinks.map { uploadFileLink -> uploadFileLink.id } }
+                    .distinctUntilChanged()
+                    .onEach { uploadFileLinksIds ->
+                        (uploadFileLinksIds - previousIds).forEach { uploadFileLinkId ->
+                            progressJobs[uploadFileLinkId] = async { announceProgress(uploadFileLinkId) }
+                        }
+                        (previousIds - uploadFileLinksIds.toSet()).forEach { removedId ->
+                            progressJobs.remove(removedId)?.cancel()
+                        }
+                        previousIds.clear()
+                        previousIds.addAll(uploadFileLinksIds)
+                    }.onCompletion {
+                        progressJobs.values.forEach { it.cancel() }
+                        progressJobs.clear()
+                        CoreLogger.d(LogTag.NOTIFICATION, "Stop observing upload file links")
+                    }.launchIn(this)
             }
-                // do not collect forever from database
-                .takeWhile { (_, count) -> count.totalWithAnnounce != 0 }
-                .map { (uploadFileLinks, _) -> uploadFileLinks.map { uploadFileLink -> uploadFileLink.id } }
-                .distinctUntilChanged()
-                .onEach { uploadFileLinksIds ->
-                    (uploadFileLinksIds - previousIds).forEach { uploadFileLinkId ->
-                        async { announceProgress(uploadFileLinkId) }
-                    }
-                    previousIds.clear()
-                    previousIds.addAll(uploadFileLinksIds)
-                }.onCompletion {
-                    CoreLogger.d(LogTag.NOTIFICATION, "Stop observing upload file links")
-                }.launchIn(this)
         } catch (e: CancellationException) {
             CoreLogger.d(LogTag.NOTIFICATION, e, e.message.orEmpty())
-            cancel(e)
+            throw e
         } finally {
             transferDataNotification.getOrNull(LogTag.NOTIFICATION)
                 ?.first
@@ -138,7 +147,7 @@ class UploadEventWorker @AssistedInject constructor(
                 }
         }
         CoreLogger.d(LogTag.NOTIFICATION, "Upload notification event worker finished")
-        Result.success()
+        return Result.success()
     }
 
     private suspend fun announceProgress(uploadFileLinkId: Long) {
diff --git a/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/worker/UploadFileSdkWorker.kt b/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/worker/UploadFileSdkWorker.kt
index 22bde925..b6093e79 100644
--- a/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/worker/UploadFileSdkWorker.kt
+++ b/drive/upload/data/src/main/kotlin/me/proton/core/drive/upload/data/worker/UploadFileSdkWorker.kt
@@ -33,8 +33,12 @@ import dagger.assisted.AssistedInject
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.base.data.workmanager.addTags
+import me.proton.core.drive.base.domain.api.ProtonApiCode.ALREADY_EXISTS
+import me.proton.core.drive.base.domain.api.ProtonApiCode.NOT_EXISTS
+import me.proton.core.drive.base.domain.extension.onProtonHttpException
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.BroadcastMessages
+import me.proton.core.drive.linkupload.domain.entity.NetworkTypeProviderType
 import me.proton.core.drive.linkupload.domain.entity.UploadFileLink
 import me.proton.core.drive.linkupload.domain.usecase.GetUploadFileLink
 import me.proton.core.drive.upload.data.extension.getSizeData
@@ -43,18 +47,21 @@ import me.proton.core.drive.upload.data.extension.log
 import me.proton.core.drive.upload.data.extension.logTag
 import me.proton.core.drive.upload.data.extension.retryOrAbort
 import me.proton.core.drive.upload.data.extension.setSize
-import me.proton.core.drive.upload.data.manager.enqueueUpload
+import me.proton.core.drive.upload.data.extension.uniqueUploadWorkName
+import me.proton.core.drive.upload.data.provider.NetworkTypeProvider
 import me.proton.core.drive.upload.data.worker.WorkerKeys.KEY_UPLOAD_FILE_LINK_ID
 import me.proton.core.drive.upload.data.worker.WorkerKeys.KEY_URI_STRING
 import me.proton.core.drive.upload.data.worker.WorkerKeys.KEY_USER_ID
 import me.proton.core.drive.upload.domain.exception.UploadNotFoundException
 import me.proton.core.drive.upload.domain.manager.UploadErrorManager
+import me.proton.core.drive.upload.domain.manager.UploadSdkManager
 import me.proton.core.drive.upload.domain.usecase.UploadFileSdk
 import me.proton.core.drive.upload.domain.usecase.UploadMetricsNotifier
 import me.proton.core.drive.worker.domain.usecase.CanRun
 import me.proton.core.drive.worker.domain.usecase.Done
 import me.proton.core.drive.worker.domain.usecase.Run
 import me.proton.core.util.kotlin.CoreLogger
+import me.proton.drive.sdk.UploadAbortedException
 import java.util.concurrent.TimeUnit
 
 @HiltWorker
@@ -67,6 +74,9 @@ class UploadFileSdkWorker @AssistedInject constructor(
     getUploadFileLink: GetUploadFileLink,
     uploadErrorManager: UploadErrorManager,
     private val uploadFileSdk: UploadFileSdk,
+    private val uploadSdkManager: UploadSdkManager,
+    private val cleanupWorkers: CleanupWorkers,
+    private val networkTypeProviders: @JvmSuppressWildcards Map<NetworkTypeProviderType, NetworkTypeProvider>,
     configurationProvider: ConfigurationProvider,
     uploadMetricsNotifier: UploadMetricsNotifier,
     canRun: CanRun,
@@ -96,20 +106,28 @@ class UploadFileSdkWorker @AssistedInject constructor(
             setSize(size.value)
         }.fold(
             onFailure = { error ->
-                if (error is UploadNotFoundException) {
-                    error.log(logTag(), "Upload not found, maybe after the app restarted")
-                    workManager.enqueueUpload(
-                        userId = uploadFileLink.userId,
-                        shouldAnnounceEvent = uploadFileLink.shouldAnnounceEvent,
-                    )
+                if (error.handle(uploadFileLink)) {
                     Result.failure()
                 } else {
-                    uploadFileLink.retryOrAbort(
-                        retryable = error.isRetryable,
-                        canRetry = canRetry(),
-                        error = error,
-                        message = "Uploading via SDK failed"
-                    )
+                    if (error is UploadAbortedException) {
+                        uploadFileLink.retryOrAbort(
+                            retryable = error.cause?.isRetryable == true,
+                            canRetry = canRetry(),
+                            error = error,
+                            message = "Uploading via SDK aborted"
+                        ).also { result ->
+                            if (result == Result.retry()) {
+                                uploadSdkManager.cancelController(uploadFileLink)
+                            }
+                        }
+                    } else {
+                        uploadFileLink.retryOrAbort(
+                            retryable = error.isRetryable,
+                            canRetry = canRetry(),
+                            error = error,
+                            message = "Uploading via SDK failed"
+                        )
+                    }
                 }
             },
             onSuccess = {
@@ -119,6 +137,50 @@ class UploadFileSdkWorker @AssistedInject constructor(
         )
     }
 
+    private suspend fun Throwable.handle(uploadFileLink: UploadFileLink): Boolean =
+        when (this) {
+            is UploadNotFoundException -> {
+                log(logTag(), "Upload not found, maybe after the app restarted")
+                uploadFileLink.recreateFileSdk()
+                true
+            }
+            else -> unwrapAborted().onProtonHttpException { protonData ->
+                when (protonData.code) {
+                    ALREADY_EXISTS,
+                    NOT_EXISTS,
+                        -> true.also {
+                        log(logTag(), "Upload in error: ${protonData.code}, will retry")
+                        uploadSdkManager.cancel(uploadFileLink)
+                        uploadFileLink.recreateFileSdk()
+                    }
+
+                    else -> false
+                }
+            } ?: false
+        }
+
+    private fun Throwable.unwrapAborted(): Throwable = if (this is UploadAbortedException) {
+        cause ?: this
+    } else {
+        this
+    }
+
+    private suspend fun UploadFileLink.recreateFileSdk() {
+        val networkType =
+            requireNotNull(networkTypeProviders[networkTypeProviderType])
+                .get(parentLinkId)
+        FileUploadFlow.RecreateFileSdk(
+            workManager,
+            this@UploadFileSdkWorker.userId,
+            this.id,
+            networkType,
+            cleanupWorkers,
+        ).enqueueWork(
+            uploadTags = listOf(uploadFileLinkId.uniqueUploadWorkName),
+            uriString = requireNotNull(this.uriString),
+        )
+    }
+
     companion object {
         fun getWorkRequest(
             userId: UserId,
diff --git a/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/manager/UploadSdkManager.kt b/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/manager/UploadSdkManager.kt
index 4a2e752a..04bc976b 100644
--- a/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/manager/UploadSdkManager.kt
+++ b/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/manager/UploadSdkManager.kt
@@ -90,7 +90,14 @@ class UploadSdkManager @Inject constructor(
             val uploader = uploader
                 ?: throw UploadNotFoundException("Upload was not enqueued or cancelled for ${uploadFileLink.id}")
 
-            controller ?: block(uploader).also { controller = it }
+            suspend fun createController(): UploadController {
+                CoreLogger.i(
+                    tag = uploadFileLink.id.logTag(),
+                    message = "Creating controller",
+                )
+                return block(uploader)
+            }
+            controller ?: createController().also { controller = it }
         }
     }
 
@@ -134,6 +141,24 @@ class UploadSdkManager @Inject constructor(
         }
     }
 
+    suspend fun cancelController(uploadFileLink: UploadFileLink) {
+        val id = uploadFileLink.id
+        val state = states[id] ?: return
+        with(state) {
+            CoreLogger.d(
+                id.logTag(), "Cancelling sdk controller: ${uploader != null}"
+            )
+            mutex.withLock {
+                controller?.apply {
+                    cancel()
+                    dispose()
+                    close()
+                }
+                controller = null
+            }
+        }
+    }
+
     private fun UploadFileLink.state(): UploadState =
         states.computeIfAbsent(id) {
             UploadState(mutex = Mutex())
diff --git a/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/usecase/CreateNewFileSdk.kt b/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/usecase/CreateNewFileSdk.kt
index b66cc31d..7e465604 100644
--- a/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/usecase/CreateNewFileSdk.kt
+++ b/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/usecase/CreateNewFileSdk.kt
@@ -25,12 +25,12 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.withContext
 import me.proton.core.drive.base.domain.entity.Bytes
 import me.proton.core.drive.base.domain.entity.TimestampS
-import me.proton.core.drive.base.domain.entity.toTimestampS
 import me.proton.core.drive.base.domain.extension.toInstant
 import me.proton.core.drive.base.domain.extension.toResult
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.crypto.domain.usecase.file.GetFileName
+import me.proton.core.drive.link.domain.extension.nodeUid
 import me.proton.core.drive.link.domain.extension.toSdkPhotoTag
 import me.proton.core.drive.linkupload.domain.entity.UploadFileLink
 import me.proton.core.drive.linkupload.domain.entity.UploadState
@@ -40,10 +40,8 @@ import me.proton.core.drive.linkupload.domain.usecase.UpdateUploadState
 import me.proton.core.drive.share.domain.entity.Share
 import me.proton.core.drive.share.domain.usecase.GetShare
 import me.proton.core.drive.upload.domain.manager.UploadSdkManager
-import me.proton.drive.sdk.Uid
 import me.proton.drive.sdk.entity.FileUploaderRequest
 import me.proton.drive.sdk.entity.PhotosUploaderRequest
-import me.proton.drive.sdk.uploader
 import java.time.Instant
 import javax.inject.Inject
 
@@ -109,10 +107,7 @@ class CreateNewFileSdk @Inject constructor(
     ) = uploadSdkManager.enqueue(this@enqueue) { client ->
         client.uploader(
             request = FileUploaderRequest(
-                parentFolderUid = Uid.makeNodeUid(
-                    volumeId = volumeId.id,
-                    nodeId = parentLinkId.id,
-                ),
+                parentFolderUid = parentLinkId.nodeUid(volumeId),
                 name = name,
                 mediaType = mimeType,
                 fileSize = size.value,
diff --git a/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/usecase/GetNextUploadFileLinks.kt b/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/usecase/GetNextUploadFileLinks.kt
index 5ead57ea..824b1893 100644
--- a/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/usecase/GetNextUploadFileLinks.kt
+++ b/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/usecase/GetNextUploadFileLinks.kt
@@ -22,7 +22,6 @@ import kotlinx.coroutines.flow.first
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.base.domain.entity.Bytes
 import me.proton.core.drive.base.domain.extension.bytes
-import me.proton.core.drive.base.domain.extension.toResult
 import me.proton.core.drive.base.domain.log.LogTag.UPLOAD
 import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.usecase.GetInternalStorageInfo
@@ -33,14 +32,11 @@ import me.proton.core.drive.linkupload.domain.extension.sizeOrZero
 import me.proton.core.drive.linkupload.domain.usecase.GetPendingUploadFileLinksSize
 import me.proton.core.drive.linkupload.domain.usecase.GetUploadFileLinksCount
 import me.proton.core.drive.linkupload.domain.usecase.GetUploadFileLinksWithUriByPriority
-import me.proton.core.drive.volume.domain.entity.Volume
-import me.proton.core.drive.volume.domain.usecase.GetActiveVolumes
 import me.proton.core.util.kotlin.CoreLogger
 import javax.inject.Inject
 
 class GetNextUploadFileLinks @Inject constructor(
     private val configurationProvider: ConfigurationProvider,
-    private val getActiveVolumes: GetActiveVolumes,
     private val getUploadFileLinksCount: GetUploadFileLinksCount,
     private val getPendingUploadFileLinksSize: GetPendingUploadFileLinksSize,
     private val getUploadFileLinksWithUriByPriority: GetUploadFileLinksWithUriByPriority,
@@ -49,15 +45,20 @@ class GetNextUploadFileLinks @Inject constructor(
     suspend operator fun invoke(
         userId: UserId,
     ): Result<List<UploadFileLink>> = coRunCatching {
-        getActiveVolumes(userId).toResult().getOrThrow().map { volume ->
-            invoke(userId, volume)
-        }.flatten()
+        val photo = invoke(userId, isPhotoShare = true)
+        val drive = invoke(userId, isPhotoShare = false)
+        val total = photo.size + drive.size
+        if (total == 0) {
+            CoreLogger.d(UPLOAD, "Nothing to upload")
+        } else {
+            CoreLogger.d(UPLOAD, "Uploading $total files: photo=${photo.size}, drive=${drive.size}")
+        }
+        photo + drive
     }
 
-    private suspend fun invoke(userId: UserId, volume: Volume): List<UploadFileLink> {
-        val uploadCount = getUploadFileLinksCount(userId, volume.id).first()
+    private suspend fun invoke(userId: UserId, isPhotoShare: Boolean): List<UploadFileLink> {
+        val uploadCount = getUploadFileLinksCount(userId, isPhotoShare).first()
         if (uploadCount.total == 0) {
-            CoreLogger.d(UPLOAD, "Nothing to upload")
             return emptyList()
         }
         val running = uploadCount.totalWithUri - uploadCount.totalUnprocessedWithUri
@@ -70,13 +71,13 @@ class GetNextUploadFileLinks @Inject constructor(
 
         val uploadFileLinks = getUploadFileLinksWithUriByPriority(
             userId = userId,
-            volumeId = volume.id,
+            isPhotoShare = isPhotoShare,
             states = setOf(UploadState.UNPROCESSED, UploadState.CREATING_NEW_FILE),
             count = uploadCount.totalWithUri,
         ).first()
 
         if (uploadFileLinks.isEmpty()) {
-            CoreLogger.d(UPLOAD, "Nothing to upload for ${volume.type}")
+            CoreLogger.d(UPLOAD, "Nothing to upload for isPhotoShare=$isPhotoShare (${uploadCount.totalWithUri})")
             return emptyList()
         }
 
diff --git a/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/usecase/UploadFileSdk.kt b/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/usecase/UploadFileSdk.kt
index 3876d542..a80c19cf 100644
--- a/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/usecase/UploadFileSdk.kt
+++ b/drive/upload/domain/src/main/kotlin/me/proton/core/drive/upload/domain/usecase/UploadFileSdk.kt
@@ -99,9 +99,6 @@ class UploadFileSdk @Inject constructor(
                     uploadSdkManager.close(uploadFileLink)
                     result
                 }
-            } catch (error: UploadNotFoundException) {
-                updateUploadState(uploadFileLink.id, UploadState.UNPROCESSED)
-                throw error
             } finally {
                 if (!isActive) {
                     withContext(NonCancellable) {
diff --git a/drive/volume/domain/src/main/kotlin/me/proton/core/drive/volume/domain/extension/NodeUid.kt b/drive/volume/domain/src/main/kotlin/me/proton/core/drive/volume/domain/extension/NodeUid.kt
new file mode 100644
index 00000000..f6c32851
--- /dev/null
+++ b/drive/volume/domain/src/main/kotlin/me/proton/core/drive/volume/domain/extension/NodeUid.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.volume.domain.extension
+
+import me.proton.core.drive.volume.domain.entity.VolumeId
+import me.proton.drive.sdk.entity.LegacyNodeUid
+import me.proton.drive.sdk.entity.NodeUid
+
+val NodeUid.volumeId get() = (this as LegacyNodeUid).volumeId.let(::VolumeId)
diff --git a/drive/volume/domain/src/main/kotlin/me/proton/core/drive/volume/domain/extension/RevisionUid.kt b/drive/volume/domain/src/main/kotlin/me/proton/core/drive/volume/domain/extension/RevisionUid.kt
new file mode 100644
index 00000000..57f4b964
--- /dev/null
+++ b/drive/volume/domain/src/main/kotlin/me/proton/core/drive/volume/domain/extension/RevisionUid.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2026 Proton AG.
+ * This file is part of Proton Core.
+ *
+ * Proton Core is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Core is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Core.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.core.drive.volume.domain.extension
+
+import me.proton.drive.sdk.entity.LegacyRevisionUid
+import me.proton.drive.sdk.entity.RevisionUid
+
+val RevisionUid.volumeId get() = (this as LegacyRevisionUid).nodeUid.volumeId
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e6f4faa5..b3a6c730 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,8 +17,8 @@ androidx-core = "1.12.0"
 androidx-datastore = "1.1.1"
 androidx-documentfile = "1.1.0"
 androidx-exif = "1.3.6"
-androidx-hilt = "1.2.0"
-androidx-hilt-navigation-compose = "1.2.0"
+androidx-hilt = "1.3.0"
+androidx-hilt-navigation-compose = "1.3.0"
 androidx-lifecycle = "2.6.2"
 androidx-media3 = "1.2.1"
 androidx-navigation = "2.7.7"
@@ -37,12 +37,12 @@ android-tools = "1.1.5"
 # Coil
 coil = "2.4.0"
 # Core
-core = "36.3.3"
+core = "36.4.2"
 core-test-quark = "14.1.0"
 # Dagger
-dagger = "2.53.1"
+dagger = "2.58"
 # Drive
-drive-sdk = "0.11.1"
+drive-sdk = "0.13.2"
 # Desugar
 desugar = "2.0.4"
 # Github
@@ -55,19 +55,21 @@ google-play-services-base = "18.10.0"
 # Gradle
 android-gradle-plugin = "8.9.1"
 proton-detekt-plugin = "1.3.0"
-paparazzi-gradle-plugin = "1.3.4"
+paparazzi-gradle-plugin = "2.0.0-alpha02"
 # JaCoCo
 jaCoCo = "0.8.8"
 # JakeWharton
 timber = "5.0.1"
 # Kotlin
-kotlin = "2.0.21"
-coroutines = "1.8.0"
-serializationJson = "1.6.3"
+kotlin = "2.2.21"
+# KSP
+ksp = "2.2.21-2.0.5"
+coroutines = "1.10.2"
+serializationJson = "1.9.0"
 # Sentry
 sentry = "7.21.0"
 # Showkase
-showkase = "1.0.3"
+showkase = "1.0.5"
 # Squareup
 leakCanary = "2.8.1"
 okhttp = "4.10.0"
@@ -91,6 +93,7 @@ gradle-plugin-hilt-android = { module = "com.google.dagger:hilt-android-gradle-p
 gradle-plugin-jaCoCo = { module = "org.jacoco:org.jacoco.core", version.ref = "jaCoCo" }
 gradle-plugin-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
 gradle-plugin-compose-compiler = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
+gradle-plugin-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
 
 # Android tools
 desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "android-tools" }
diff --git a/photos/domain/src/main/kotlin/me/proton/android/drive/photos/domain/usecase/FetchAllPhotoListingsImpl.kt b/photos/domain/src/main/kotlin/me/proton/android/drive/photos/domain/usecase/FetchAllPhotoListingsImpl.kt
index f8aea616..3350cba1 100644
--- a/photos/domain/src/main/kotlin/me/proton/android/drive/photos/domain/usecase/FetchAllPhotoListingsImpl.kt
+++ b/photos/domain/src/main/kotlin/me/proton/android/drive/photos/domain/usecase/FetchAllPhotoListingsImpl.kt
@@ -20,19 +20,24 @@ package me.proton.android.drive.photos.domain.usecase
 
 import me.proton.core.domain.entity.UserId
 import me.proton.core.drive.base.domain.extension.toResult
+import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.link.domain.entity.FileId
+import me.proton.core.drive.link.domain.entity.PhotoTag
 import me.proton.core.drive.photo.domain.entity.PhotoListing
 import me.proton.core.drive.photo.domain.repository.PhotoRepository
 import me.proton.core.drive.photo.domain.usecase.FetchAllPhotoListings
 import me.proton.core.drive.share.crypto.domain.usecase.GetPhotoShare
+import me.proton.core.drive.share.domain.entity.ShareId
 import me.proton.core.drive.volume.domain.entity.VolumeId
 import javax.inject.Inject
 
 class FetchAllPhotoListingsImpl @Inject constructor(
     private val photoRepository: PhotoRepository,
     private val getPhotoShare: GetPhotoShare,
+    private val configurationProvider: ConfigurationProvider,
 ) : FetchAllPhotoListings {
+
     override suspend operator fun invoke(
         userId: UserId,
         volumeId: VolumeId,
@@ -40,19 +45,68 @@ class FetchAllPhotoListingsImpl @Inject constructor(
         linkId: FileId?,
     ): Result<List<PhotoListing>> = coRunCatching {
         val share = getPhotoShare(userId, volumeId).toResult().getOrThrow()
-        var lastLinkId: FileId? = linkId
         val photoListings = mutableListOf<PhotoListing>()
-        do {
+        fetchPages(
+            userId = userId,
+            volumeId = volumeId,
+            shareId = share.id,
+            pageSize = pageSize,
+            initialPageKey = linkId?.id,
+            tag = null,
+        ) { fetched, _, _ ->
+            photoListings += fetched
+        }
+        photoListings
+    }
+
+    override suspend operator fun invoke(
+        userId: UserId,
+        volumeId: VolumeId,
+        shareId: ShareId,
+        tag: PhotoTag?,
+        initialPageKey: String?,
+        postPageProcess: suspend (nextKey: String?, isComplete: Boolean, pageCount: Int) -> Unit,
+    ): Result<Unit> = coRunCatching {
+        fetchPages(
+            userId = userId,
+            volumeId = volumeId,
+            shareId = shareId,
+            pageSize = configurationProvider.apiListingPageSize,
+            initialPageKey = initialPageKey,
+            tag = tag,
+        ) { fetched, nextKey, endOfPagination ->
+            postPageProcess(
+                if (endOfPagination) null else nextKey,
+                endOfPagination,
+                fetched.size,
+            )
+        }
+    }
+
+    private suspend fun fetchPages(
+        userId: UserId,
+        volumeId: VolumeId,
+        shareId: ShareId,
+        pageSize: Int,
+        initialPageKey: String?,
+        tag: PhotoTag?,
+        onPage: suspend (fetched: List<PhotoListing>, nextKey: String?, endOfPagination: Boolean) -> Unit,
+    ) {
+        var pageKey = initialPageKey
+        while (true) {
             val fetched = photoRepository.fetchAndStorePhotoListings(
                 userId = userId,
                 volumeId = volumeId,
-                shareId = share.id,
+                shareId = shareId,
                 pageSize = pageSize,
-                previousPageLastLinkId = lastLinkId?.id,
+                previousPageLastLinkId = pageKey,
+                tag = tag,
             )
-            photoListings += fetched
-            lastLinkId = fetched.lastOrNull()?.linkId
-        } while (fetched.size == pageSize)
-        photoListings
+            val endOfPagination = fetched.size < pageSize
+            val nextKey = fetched.lastOrNull()?.linkId?.id
+            onPage(fetched, nextKey, endOfPagination)
+            if (endOfPagination) break
+            pageKey = nextKey
+        }
     }
 }
diff --git a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/Album.kt b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/Album.kt
index 199e8a39..6d34fbec 100644
--- a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/Album.kt
+++ b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/Album.kt
@@ -171,6 +171,7 @@ fun Album(
         isNameEncrypted = viewState.isNameEncrypted,
         details = viewState.details,
         navigationIcon = viewState.navigationIconResId,
+        navigationContentDescription = viewState.navigationContentDescription,
         title = viewState.title,
         coverLinkId = viewState.coverLinkId,
         items = items,
@@ -209,6 +210,7 @@ fun Album(
     isNameEncrypted: Boolean,
     details: String,
     navigationIcon: Int?,
+    navigationContentDescription: String?,
     title: String?,
     coverLinkId: FileId?,
     items: LazyPagingItems<PhotosItem.PhotoListing>,
@@ -260,6 +262,7 @@ fun Album(
         isNameEncrypted = isNameEncrypted,
         details = details,
         navigationIcon = navigationIcon,
+        navigationContentDescription = navigationContentDescription,
         title = title,
         coverLinkId = coverLinkId,
         items = items,
@@ -298,6 +301,7 @@ fun Album(
     isNameEncrypted: Boolean,
     details: String,
     navigationIcon: Int?,
+    navigationContentDescription: String?,
     title: String?,
     coverLinkId: FileId?,
     items: LazyPagingItems<PhotosItem.PhotoListing>,
@@ -358,6 +362,7 @@ fun Album(
         topComposable = {
             AlbumTopBar(
                 navigationIcon = navigationIcon,
+                navigationContentDescription = navigationContentDescription,
                 title = title,
                 coverLink = coverLinkId?.let { driveLinksMap[coverLinkId] },
                 topComposableHeight = topComposableHeight,
@@ -486,6 +491,7 @@ fun Album(
 @Composable
 fun BoxScope.AlbumTopBar(
     @DrawableRes navigationIcon: Int?,
+    navigationContentDescription: String?,
     title: String?,
     coverLink: DriveLink?,
     topComposableHeight: Dp,
@@ -528,6 +534,7 @@ fun BoxScope.AlbumTopBar(
         )
         TopAppBar(
             navigationIcon = navigationIcon?.let { painterResource(navigationIcon) },
+            navigationContentDescription = navigationContentDescription,
             onNavigationIcon = onTopAppBarNavigation,
             title = { modifier ->
                 title?.let {
diff --git a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/BackupIssues.kt b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/BackupIssues.kt
index 7d2500a6..fbf950e4 100644
--- a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/BackupIssues.kt
+++ b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/BackupIssues.kt
@@ -77,6 +77,7 @@ fun BackupIssues(
         Column {
             TopAppBar(
                 navigationIcon = painterResource(id = CorePresentation.drawable.ic_arrow_back),
+                navigationContentDescription = stringResource(I18N.string.common_back_action),
                 onNavigationIcon = { onBack() },
                 title = stringResource(id = I18N.string.backup_issues_title),
             )
diff --git a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/LibraryFolders.kt b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/LibraryFolders.kt
index 9e3ad436..e1830b27 100644
--- a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/LibraryFolders.kt
+++ b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/LibraryFolders.kt
@@ -19,6 +19,9 @@
 package me.proton.android.drive.photos.presentation.component
 
 import android.net.Uri
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.VisibilityThreshold
+import androidx.compose.animation.core.spring
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
@@ -46,6 +49,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import coil.compose.rememberAsyncImagePainter
@@ -128,7 +132,14 @@ private fun LibraryFoldersList(
             ) { libraryFolder ->
                 when (libraryFolder) {
                     is LibraryFolder.Entry -> LibraryFolderItem(
-                        modifier = itemModifier.animateItemPlacement(),
+                        modifier = itemModifier.animateItem(
+                            fadeInSpec = null,
+                            fadeOutSpec = null,
+                            placementSpec = spring(
+                                    stiffness = Spring.StiffnessMediumLow,
+                                    visibilityThreshold = IntOffset.VisibilityThreshold
+                                ),
+                        ),
                         name = libraryFolder.name,
                         description = {
                             Text(
diff --git a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/MediaItem.kt b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/MediaItem.kt
index 33f84203..a239e37b 100644
--- a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/MediaItem.kt
+++ b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/MediaItem.kt
@@ -54,6 +54,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil.ImageLoader
 import coil.compose.LocalImageLoader
+import coil.request.Disposable
 import com.google.accompanist.placeholder.PlaceholderHighlight
 import com.google.accompanist.placeholder.placeholder
 import com.google.accompanist.placeholder.shimmer
@@ -120,6 +121,7 @@ fun MediaItem(
                 .background(ProtonTheme.colors.backgroundSecondary),
         ) {
             val linkId = thumbnailVO?.fileId ?: link?.id
+            val rendered = remember(linkId) { booleanArrayOf(false) }
             Image(
                 modifier = Modifier
                     .fillMaxSize()
@@ -137,7 +139,8 @@ fun MediaItem(
                     )
                     .drawWithContent {
                         drawContent()
-                        if (linkId != null) {
+                        if (linkId != null && !rendered[0]) {
+                            rendered[0] = true
                             onRenderThumbnail(linkId)
                         }
                     },
@@ -381,15 +384,20 @@ private fun PhotoIcon(
     }
 }
 
-private fun DriveLink.preCachePhotoThumbnail(context: Context, imageLoader: ImageLoader) {
+private fun DriveLink.preCacheThumbnail(context: Context, imageLoader: ImageLoader, thumbnailType: ThumbnailType): Disposable? =
     (this as? DriveLink.File)
         ?.takeIf { it.mimeType.toFileTypeCategory() == FileTypeCategory.Image }
         ?.let { photoDriveLink ->
-            photoDriveLink.getThumbnailId(ThumbnailType.PHOTO)?.let {
-                photoDriveLink.thumbnailVO(ThumbnailType.PHOTO)
+            photoDriveLink.getThumbnailId(thumbnailType)?.let {
+                photoDriveLink.thumbnailVO(thumbnailType)
             }
         }?.preCache(context, imageLoader)
-}
+
+fun DriveLink.preCachePhotoThumbnail(context: Context, imageLoader: ImageLoader): Disposable? =
+    preCacheThumbnail(context, imageLoader, ThumbnailType.PHOTO)
+
+fun DriveLink.preCacheDefaultThumbnail(context: Context, imageLoader: ImageLoader): Disposable? =
+    preCacheThumbnail(context, imageLoader, ThumbnailType.DEFAULT)
 
 private val iconSize = 12.dp
 
diff --git a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/Photos.kt b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/Photos.kt
index a0c2cc40..f57e3766 100644
--- a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/Photos.kt
+++ b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/Photos.kt
@@ -65,10 +65,10 @@ fun Photos(
 ) {
     val items = photos.collectAsLazyPagingItems()
     LaunchedEffect(items) {
-        snapshotFlow { items.loadState }
+        snapshotFlow { items.loadState to items.itemCount }
             .distinctUntilChanged()
-            .collect { loadState ->
-                viewEvent.onLoadState(loadState, items.itemCount)
+            .collect { (loadState, itemCount) ->
+                viewEvent.onLoadState(loadState, itemCount)
             }
     }
     listEffect.HandleListEffect(items = items)
diff --git a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/PhotosContent.kt b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/PhotosContent.kt
index 0674a8f6..2b9e0746 100644
--- a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/PhotosContent.kt
+++ b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/component/PhotosContent.kt
@@ -48,14 +48,17 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalHapticFeedback
+import coil.compose.LocalImageLoader
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.itemKey
+import coil.request.Disposable
 import kotlinx.coroutines.flow.Flow
 import me.proton.android.drive.photos.presentation.extension.rememberLazyGridState
 import me.proton.android.drive.photos.presentation.state.PhotosItem
@@ -166,15 +169,32 @@ fun PhotosContent(
     val gridState = items.rememberLazyGridState()
     val driveLinksMap by driveLinksFlow.collectAsStateWithLifecycle(initialValue = emptyMap())
     val firstVisibleItemIndex by remember(gridState) { derivedStateOf { gridState.firstVisibleItemIndex } }
-    LaunchedEffect(firstVisibleItemIndex, items.itemSnapshotList.items) {
+    val visibleCount by remember(gridState) { derivedStateOf { gridState.layoutInfo.visibleItemsInfo.size.coerceAtLeast(1) } }
+    val localContext = LocalContext.current
+    val imageLoader = LocalImageLoader.current
+    val precacheDisposables = remember { mutableMapOf<LinkId, Disposable>() }
+    LaunchedEffect(firstVisibleItemIndex, visibleCount, driveLinksMap) {
+        items.itemSnapshotList.items
+            .takeIf { list -> list.isNotEmpty() }
+            ?.targetIds(visibleCount, firstVisibleItemIndex)
+            ?.disposeNonTargeted(precacheDisposables)
+            ?.filter { targetId -> targetId !in precacheDisposables }
+            ?.mapNotNull { targetId -> driveLinksMap[targetId]?.let { driveLink -> targetId to driveLink } }
+            ?.forEach { (id, driveLink) ->
+                driveLink.preCacheDefaultThumbnail(localContext, imageLoader)
+                    ?.also { precacheDisposables[id] = it }
+            } ?: return@LaunchedEffect
+    }
+    LaunchedEffect(firstVisibleItemIndex, visibleCount, items.itemSnapshotList.items) {
         onScroll(
             firstVisibleItemIndex,
             items.itemSnapshotList.items
                 .takeIf { list -> list.isNotEmpty() && list.size > firstVisibleItemIndex }
                 ?.let { list ->
                     val sizeRange = IntRange(0, list.size - 1)
-                    val fromIndex = (firstVisibleItemIndex - 10).coerceIn(sizeRange)
-                    val toIndex = (firstVisibleItemIndex + 20).coerceIn(sizeRange)
+                    val offscreenPageSize = minOf(visibleCount, MAX_OFFSCREEN_PAGE_SIZE)
+                    val fromIndex = (firstVisibleItemIndex - offscreenPageSize).coerceIn(sizeRange)
+                    val toIndex = (firstVisibleItemIndex + visibleCount + offscreenPageSize - 1).coerceIn(sizeRange)
                     list.subList(fromIndex, toIndex + 1)
                         .filterIsInstance<PhotosItem.PhotoListing>()
                         .map { photoListing -> photoListing.id }
@@ -331,3 +351,29 @@ fun PhotosContent(
         )
     }
 }
+
+private fun List<PhotosItem>.targetIds(
+    visibleCount: Int,
+    firstVisibleItemIndex: Int,
+): Set<FileId> {
+    val sizeRange = IntRange(0, size - 1)
+    val offscreenPageSize = minOf(visibleCount, MAX_OFFSCREEN_PAGE_SIZE)
+    val afterFrom = (firstVisibleItemIndex + visibleCount).coerceIn(sizeRange)
+    val afterTo = (firstVisibleItemIndex + visibleCount + offscreenPageSize - 1).coerceIn(sizeRange)
+    val beforeFrom = (firstVisibleItemIndex - offscreenPageSize).coerceIn(sizeRange)
+    val beforeTo = (firstVisibleItemIndex - 1).coerceIn(sizeRange)
+    return (subList(afterFrom, afterTo + 1) + subList(beforeFrom, beforeTo + 1))
+        .filterIsInstance<PhotosItem.PhotoListing>()
+        .map { photoListing ->  photoListing.id }
+        .toSet()
+}
+
+private fun Set<FileId>.disposeNonTargeted(
+    precacheDisposables: MutableMap<LinkId, Disposable>
+): Set<FileId> = this.apply {
+    (precacheDisposables.keys - this).forEach { id ->
+        precacheDisposables.remove(id)?.dispose()
+    }
+}
+
+private const val MAX_OFFSCREEN_PAGE_SIZE = 36
diff --git a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/extension/PhotosItem.kt b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/extension/PhotosItem.kt
index 42c1e35c..c18a8eab 100644
--- a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/extension/PhotosItem.kt
+++ b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/extension/PhotosItem.kt
@@ -51,18 +51,21 @@ suspend fun List<PhotosItem>.getFastScrollAnchors(
             SeparatorWithIndexAndCount(
                 separatorWithIndex = current,
                 count = (next?.index ?: size) - current.index,
-            ).also {
-                CoreLogger.v(
-                    tag = LogTag.PHOTO,
-                    message =listOf(
-                        "Triple(${it.separatorWithIndex.separator.year}",
-                        "${it.separatorWithIndex.separator.month + 1}",
-                        "${it.count - 1}),",
-                    ).joinToString(","),
-                )
-            }
+            )
         }
         .toList()
+        .also { separators ->
+            CoreLogger.d(
+                tag = LogTag.PHOTO,
+                message = buildString {
+                    append("Triples (sections=${separators.size})")
+                    append(separators.joinToString(prefix = "[", postfix = "]") {
+                            "(${it.separatorWithIndex.separator.year},${it.separatorWithIndex.separator.month + 1},${it.count - 1})"
+                        }
+                    )
+                },
+            )
+        }
     var availableAnchors = anchors - 1
     val separatorsToAnchors = separators.associateWith {
         if (availableAnchors > 0) {
diff --git a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/viewstate/AlbumViewState.kt b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/viewstate/AlbumViewState.kt
index 6fb9e583..56641126 100644
--- a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/viewstate/AlbumViewState.kt
+++ b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/viewstate/AlbumViewState.kt
@@ -39,6 +39,7 @@ data class AlbumViewState(
     val inMultiselect: Boolean = false,
     val showActions: Boolean = true,
     @DrawableRes val navigationIconResId: Int? = null,
+    val navigationContentDescription: String? = null,
     val title: String? = null,
     val showAddAction: Boolean = true,
     val addActionEnabled: Boolean = true,
diff --git a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/viewstate/AlbumsViewState.kt b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/viewstate/AlbumsViewState.kt
index 81013098..575d1933 100644
--- a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/viewstate/AlbumsViewState.kt
+++ b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/viewstate/AlbumsViewState.kt
@@ -33,6 +33,7 @@ data class AlbumsViewState(
     val listContentState: ListContentState,
     val isRefreshEnabled: Boolean,
     @DrawableRes val navigationIconResId: Int,
+    val navigationContentDescription: String?,
     val filters: List<AlbumsFilter> = emptyList(),
     @DrawableRes val placeholderImageResId: Int,
 )
diff --git a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/viewstate/PhotosViewState.kt b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/viewstate/PhotosViewState.kt
index 652e4f09..2a7ffea1 100644
--- a/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/viewstate/PhotosViewState.kt
+++ b/photos/presentation/src/main/kotlin/me/proton/android/drive/photos/presentation/viewstate/PhotosViewState.kt
@@ -31,6 +31,7 @@ import me.proton.core.drive.link.domain.entity.PhotoTag
 data class PhotosViewState(
     val title: String,
     @DrawableRes val navigationIconResId: Int,
+    val navigationContentDescription: String?,
     val topBarActions: Flow<Set<Action>> = emptyFlow(),
     val listContentState: ListContentState,
     val showEmptyList: Boolean?,
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 27ca40fe..1693bf34 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -77,7 +77,7 @@ pluginManagement {
 
 plugins {
     id("me.proton.core.gradle-plugins.include-core-build") version "1.3.0"
-    id("com.gradle.enterprise") version "3.12.6"
+    id("com.gradle.enterprise") version "3.13.1"
 }
 
 gradleEnterprise {