build: update gradle wrapper and build logic conventions

Remove duplicate auth ValidationType and use the shared network model instead.
Add support for both "sms" and "2fa_sms" SMS validation values.

.github/workflows/build.yml

@@ -1,10 +1,10 @@
 name: Android CI Build
 
 on:
-  push:
+  workflow_dispatch:
-    branches: [ "dev", "release/*", "hotfix/*" ]
+
-  pull_request:
+permissions:
-    branches: [ "dev", "release/*", "hotfix/*" ]
+  contents: read
 
 env:
   KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
@@ -12,37 +12,51 @@ env:
   RELEASE_SIGN_KEY_PASSWORD: ${{ secrets.RELEASE_SIGN_KEY_PASSWORD }}
 
 jobs:
-  build_apk_aab:
+  build_apks:
     runs-on: ubuntu-24.04
     name: Build artifacts
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
-      - name: set up JDK 17
+      - name: set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Build and sign debug APK
-        run: ./gradlew assembleDebug
-
-      - name: Upload debug APK
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-debug.apk
-          path: app/build/outputs/apk/debug/app-debug.apk
-
       - name: Build and sign release APK
         run: ./gradlew assembleRelease
 
-      - name: Upload release APK
+      - name: Find generated release APK name
-        uses: actions/upload-artifact@v4
+        id: find_apk_release
+        run: |
+          APK_PATH=$(find app/build/outputs/apk/release -name "*.apk" | head -n 1)
+          echo "APK_PATH=$APK_PATH" >> $GITHUB_ENV
+          echo "APK_NAME=$(basename $APK_PATH)" >> $GITHUB_ENV
+
+      - name: Upload APK with original name
+        uses: actions/upload-artifact@v7
         with:
-          name: app-release.apk
+          name: ${{ env.APK_NAME }}
-          path: app/build/outputs/apk/release/app-release.apk
+          path: ${{ env.APK_PATH }}
+
+      - name: Build and sign debug APK
+        run: ./gradlew assembleDebug
+
+      - name: Find generated debug APK name
+        id: find_apk_debug
+        run: |
+            APK_PATH=$(find app/build/outputs/apk/debug -name "*.apk" | head -n 1)
+            echo "APK_PATH=$APK_PATH" >> $GITHUB_ENV
+            echo "APK_NAME=$(basename $APK_PATH)" >> $GITHUB_ENV
+
+      - name: Upload APK with original name
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ env.APK_NAME }}
+          path: ${{ env.APK_PATH }}

.github/workflows/create_release.yml

@@ -1,8 +1,11 @@
 name: Android CI Release
+permissions:
+  contents: read
 
 on:
-  pull_request:
+  workflow_dispatch:
-    branches: [ "master" ]
+  push:
+    branches: [ "release/*"]
 
 env:
   KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
@@ -15,50 +18,32 @@ jobs:
     name: Build artifacts
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
-      - name: set up JDK 17
+      - name: set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Build and sign debug APK
-        run: ./gradlew assembleDebug
-
-      - name: Upload debug APK
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-debug.apk
-          path: app/build/outputs/apk/debug/app-debug.apk
-
       - name: Build and sign release APK
         run: ./gradlew assembleRelease
 
       - name: Upload release APK
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: app-release.apk
           path: app/build/outputs/apk/release/app-release.apk
 
-      - name: Build and sign debug Bundle
-        run: ./gradlew bundleDebug
-
-      - name: Upload debug Bundle
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-debug.aab
-          path: app/build/outputs/bundle/debug/app-debug.aab
-
       - name: Build and sign release Bundle
         run: ./gradlew bundleRelease
 
       - name: Upload release Bundle
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: app-release.aab
           path: app/build/outputs/bundle/release/app-release.aab

README.md

@@ -7,52 +7,64 @@ Unofficial messenger for russian social network VKontakte
     - [x] 2FA support
         - [x] Resend otp
     - [x] Captcha support
-    - [ ] Support for new authorization with service and refresh tokens
+    - [x] Support for new authorization with service and refresh tokens
+    - [ ] Handle token expiration
+    - [x] Ability to export/import tokens
 - [x] Conversations list
     - [x] Pagination
     - [x] Manual refresh
     - [x] Pin & unpin conversations
     - [x] Delete conversations
-    - [ ] Archive
+    - [x] Archive
-        - [ ] View archived conversations
+        - [x] View archived conversations
-        - [ ] Archive & unarchive conversations
+        - [x] Archive & unarchive conversations
 - [x] Friends list
-    - [ ] Sort alphabetically, by priority or random
+    - [x] Sort alphabetically, by priority or random
-    - [ ] Separate tab with only friends who are online
+    - [x] Separate tab with only friends who are online
 - [x] Settings screen
     - [ ] TODO
 - [x] Chat screen
-    - [ ] Pagination
+    - [x] Pagination
     - [x] Manual refresh
     - [x] Message bubbles
         - [x] Text
-        - [ ] Date
+        - [x] Date
-        - [ ] Message's attachments
+        - [x] Read status
-            - [ ] Photo
+        - [x] Edit status
-            - [ ] Video
+        - [x] Sending status
-            - [ ] Audio
+        - [x] Message's attachments
-            - [ ] File
+            - [x] Photo
-            - [ ] Link
+            - [x] Video
+            - [x] Audio
+            - [x] File
+            - [x] Link
+            - [x] Sticker
+            - [x] Reply
+            - [ ] Forwarded messages
+            - [ ] Wall post
+            - [ ] Comment in wall post
+            - [ ] Poll
             - [ ] TODO
     - [x] Send messages
-    - [ ] Pinned message
+    - [x] Pinned message
-    - [ ] Pin & unpin messages
+    - [x] Pin & unpin messages
-    - [ ] Reply to message
+    - [x] Reply to message
-    - [ ] Delete message
+    - [x] Swipe to reply to message
-    - [ ] Select multiple messages
+    - [x] Delete message
-        - [ ] Delete
+    - [x] Select multiple messages
+        - [x] Delete
         - [ ] Forward
         - [ ] Forward in current chat
     - [ ] Send attachments to chat
         - [ ] TODO
 - [x] Chat materials (attachments)
     - [x] Separate tabs for each attachment type
-        - [ ] Pagination
+        - [x] Pagination
         - [x] Manual refresh
     - [x] View attachments
         - [x] Open photo
             - [x] Internal viewer
-            - [ ] External viewer
+            - [x] External viewer
         - [ ] Open video in external player
         - [ ] TODO
 - [ ] Caching

app/build.gradle.kts

@@ -1,3 +1,4 @@
+import com.android.build.gradle.internal.api.BaseVariantOutputImpl
 import java.util.Properties
 
 plugins {
@@ -12,8 +13,8 @@ android {
     defaultConfig {
         applicationId = "dev.meloda.fastvk"
 
-        versionCode = libs.versions.versionCode.get().toInt()
+        versionCode = 11
-        versionName = libs.versions.versionName.get()
+        versionName = "0.2.3"
     }
 
     signingConfigs {
@@ -42,11 +43,10 @@ android {
 
     buildTypes {
         named("debug") {
-            signingConfig = signingConfigs.getByName("debugSigning")
             applicationIdSuffix = ".debug"
         }
         named("release") {
-            signingConfig = signingConfigs.getByName("release")
+            signingConfig = signingConfigs.getByName("debug")
 
             isMinifyEnabled = true
             isShrinkResources = true
@@ -58,6 +58,18 @@ android {
         }
     }
 
+//    applicationVariants.all {
+//        outputs.all {
+//            val date = System.currentTimeMillis() / 1000
+//            val buildType = buildType.name
+//            val appVersion = versionName
+//            val appVersionCode = versionCode
+//
+//            val newApkName = "app-$buildType-v$appVersion($appVersionCode)-$date.apk"
+//            (this as? BaseVariantOutputImpl)?.outputFileName = newApkName
+//        }
+//    }
+
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -66,10 +78,13 @@ android {
 }
 
 dependencies {
+    implementation(libs.acra.email)
+    implementation(libs.acra.dialog)
+
     implementation(projects.feature.auth)
 
     implementation(projects.feature.chatmaterials)
-    implementation(projects.feature.conversations)
+    implementation(projects.feature.convos)
     implementation(projects.feature.languagepicker)
     implementation(projects.feature.messageshistory)
     implementation(projects.feature.photoviewer)

app/src/main/kotlin/dev/meloda/fast/MainViewModel.kt

@@ -24,6 +24,7 @@ import dev.meloda.fast.datastore.UserSettings
 import dev.meloda.fast.domain.GetCurrentAccountUseCase
 import dev.meloda.fast.domain.LoadUserByIdUseCase
 import dev.meloda.fast.model.BaseError
+import dev.meloda.fast.model.api.domain.VkUser
 import dev.meloda.fast.navigation.Main
 import dev.meloda.fast.settings.navigation.Settings
 import kotlinx.coroutines.Dispatchers
@@ -36,14 +37,13 @@ interface MainViewModel {
 
     val startDestination: StateFlow<Any?>
     val isNeedToReplaceWithAuth: StateFlow<Boolean>
+    val currentUser: StateFlow<VkUser?>
 
     val isNeedToShowNotificationsDeniedDialog: StateFlow<Boolean>
     val isNeedToShowNotificationsRationaleDialog: StateFlow<Boolean>
     val isNeedToCheckNotificationsPermission: StateFlow<Boolean>
     val isNeedToRequestNotifications: StateFlow<Boolean>
 
-    val profileImageUrl: StateFlow<String?>
-
     fun onError(error: BaseError)
 
     fun onNavigatedToAuth()
@@ -59,6 +59,8 @@ interface MainViewModel {
     fun onNotificationsDeniedDialogDismissed()
     fun onNotificationsRationaleDialogDismissed()
     fun onNotificationsRationaleDialogCancelClicked()
+
+    fun onUserAuthenticated()
 }
 
 class MainViewModelImpl(
@@ -70,24 +72,24 @@ class MainViewModelImpl(
 
     override val startDestination = MutableStateFlow<Any?>(null)
     override val isNeedToReplaceWithAuth = MutableStateFlow(false)
+    override val currentUser = MutableStateFlow<VkUser?>(null)
 
     override val isNeedToShowNotificationsDeniedDialog = MutableStateFlow(false)
     override val isNeedToShowNotificationsRationaleDialog = MutableStateFlow(false)
     override val isNeedToCheckNotificationsPermission = MutableStateFlow(false)
     override val isNeedToRequestNotifications = MutableStateFlow(false)
 
-    override val profileImageUrl = MutableStateFlow<String?>(null)
-
     private var openNotificationsSettings = false
     private var openAppSettings = false
 
     override fun onError(error: BaseError) {
         when (error) {
-            BaseError.SessionExpired -> {
+            BaseError.SessionExpired,
+            BaseError.AccountBlocked -> {
                 isNeedToReplaceWithAuth.update { true }
             }
 
-            is BaseError.SimpleError -> Unit // TODO: 21-Mar-25, Danil Nikolaev: show error in ui
+            else -> Unit // TODO: 21-Mar-25, Danil Nikolaev: show error in ui
         }
     }
 
@@ -170,17 +172,20 @@ class MainViewModelImpl(
         disableBackgroundLongPoll()
     }
 
+    override fun onUserAuthenticated() {
+        loadProfile()
+    }
+
     private fun loadProfile() {
         loadUserByIdUseCase(userId = null)
             .listenValue(viewModelScope) { state ->
                 state.processState(
                     error = { error ->
-                        profileImageUrl.emit(null)
+                        currentUser.emit(null)
                     },
                     success = { response ->
                         val user = response ?: return@listenValue
-
+                        currentUser.emit(user)
-                        profileImageUrl.emit(user.photo100)
                     }
                 )
             }

app/src/main/kotlin/dev/meloda/fast/common/AppGlobal.kt

@@ -4,8 +4,14 @@ import android.app.Application
 import androidx.preference.PreferenceManager
 import coil.ImageLoader
 import coil.ImageLoaderFactory
+import com.skydoves.compose.stability.runtime.ComposeStabilityAnalyzer
+import dev.meloda.fast.auth.BuildConfig
 import dev.meloda.fast.common.di.applicationModule
 import dev.meloda.fast.datastore.AppSettings
+import org.acra.config.dialog
+import org.acra.config.mailSender
+import org.acra.data.StringFormat
+import org.acra.ktx.initAcra
 import org.koin.android.ext.android.get
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
@@ -18,10 +24,14 @@ class AppGlobal : Application(), ImageLoaderFactory {
 
         val preferences = PreferenceManager.getDefaultSharedPreferences(this)
         AppSettings.init(preferences)
+        ComposeStabilityAnalyzer.setEnabled(BuildConfig.DEBUG)
 
         initKoin()
+        initAcra()
     }
 
+    override fun newImageLoader(): ImageLoader = get()
+
     private fun initKoin() {
         startKoin {
             androidLogger()
@@ -30,5 +40,21 @@ class AppGlobal : Application(), ImageLoaderFactory {
         }
     }
 
-    override fun newImageLoader(): ImageLoader = get()
+    private fun initAcra() {
+        initAcra {
+            buildConfigClass = BuildConfig::class.java
+            reportFormat = StringFormat.JSON
+
+            mailSender {
+                mailTo = "lischenkodev@gmail.com"
+                reportAsFile = true
+                reportFileName = "Crash.txt"
+            }
+
+            dialog {
+                text = "App crashed"
+                enabled = true
+            }
+        }
+    }
 }

app/src/main/kotlin/dev/meloda/fast/common/di/ApplicationModule.kt

@@ -5,18 +5,17 @@ import android.content.res.Resources
 import android.os.PowerManager
 import androidx.preference.PreferenceManager
 import coil.ImageLoader
+import coil.annotation.ExperimentalCoilApi
 import dev.meloda.fast.MainViewModelImpl
-import dev.meloda.fast.auth.captcha.di.captchaModule
+import dev.meloda.fast.auth.authModule
-import dev.meloda.fast.auth.login.di.loginModule
-import dev.meloda.fast.auth.validation.di.validationModule
 import dev.meloda.fast.chatmaterials.di.chatMaterialsModule
 import dev.meloda.fast.common.LongPollController
 import dev.meloda.fast.common.LongPollControllerImpl
 import dev.meloda.fast.common.provider.Provider
 import dev.meloda.fast.common.provider.ResourceProvider
 import dev.meloda.fast.common.provider.ResourceProviderImpl
-import dev.meloda.fast.conversations.di.conversationsModule
+import dev.meloda.fast.convos.di.convosModule
-import dev.meloda.fast.conversations.di.createChatModule
+import dev.meloda.fast.convos.di.createChatModule
 import dev.meloda.fast.domain.di.domainModule
 import dev.meloda.fast.friends.di.friendsModule
 import dev.meloda.fast.languagepicker.di.languagePickerModule
@@ -33,13 +32,12 @@ import org.koin.core.qualifier.qualifier
 import org.koin.dsl.bind
 import org.koin.dsl.module
 
+@OptIn(ExperimentalCoilApi::class)
 val applicationModule = module {
     includes(domainModule)
     includes(
-        loginModule,
+        authModule,
-        validationModule,
+        convosModule,
-        captchaModule,
-        conversationsModule,
         settingsModule,
         messagesHistoryModule,
         photoViewModule,
@@ -51,7 +49,6 @@ val applicationModule = module {
         createChatModule
     )
 
-    // TODO: 14/05/2024, Danil Nikolaev: research on memory leaks and potentials errors
     // TODO: 14/05/2024, Danil Nikolaev: extract all operations with preferences to standalone class
     singleOf(PreferenceManager::getDefaultSharedPreferences)
     single<Resources> { androidContext().resources }
@@ -67,6 +64,7 @@ val applicationModule = module {
         ImageLoader.Builder(get())
             .crossfade(true)
             .build()
+            .also { it.diskCache?.directory?.toFile()?.listFiles() }
     }
 
     singleOf(::LongPollControllerImpl) bind LongPollController::class

app/src/main/kotlin/dev/meloda/fast/navigation/MainGraph.kt

@@ -2,16 +2,15 @@ package dev.meloda.fast.navigation
 
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import dev.meloda.fast.MainViewModel
+import dev.meloda.fast.convos.navigation.ConvoGraph
-import dev.meloda.fast.conversations.navigation.Conversations
 import dev.meloda.fast.friends.navigation.Friends
 import dev.meloda.fast.model.BaseError
 import dev.meloda.fast.model.BottomNavigationItem
 import dev.meloda.fast.presentation.MainScreen
 import dev.meloda.fast.profile.navigation.Profile
+import dev.meloda.fast.ui.R
 import dev.meloda.fast.ui.util.ImmutableList
 import kotlinx.serialization.Serializable
-import dev.meloda.fast.ui.R as UiR
 
 @Serializable
 object MainGraph
@@ -22,29 +21,28 @@ object Main
 fun NavGraphBuilder.mainScreen(
     onError: (BaseError) -> Unit,
     onSettingsButtonClicked: () -> Unit,
-    onConversationClicked: (conversationId: Int) -> Unit,
+    onNavigateToMessagesHistory: (convoId: Long) -> Unit,
     onPhotoClicked: (url: String) -> Unit,
-    onMessageClicked: (userId: Int) -> Unit,
+    onMessageClicked: (userid: Long) -> Unit,
-    onCreateChatClicked: () -> Unit,
+    onNavigateToCreateChat: () -> Unit
-    viewModel: MainViewModel
 ) {
     val navigationItems = ImmutableList.of(
         BottomNavigationItem(
-            titleResId = UiR.string.title_friends,
+            titleResId = R.string.title_friends,
-            selectedIconResId = UiR.drawable.baseline_people_alt_24,
+            selectedIconResId = R.drawable.ic_group_fill_round_24,
-            unselectedIconResId = UiR.drawable.outline_people_alt_24,
+            unselectedIconResId = R.drawable.ic_group_round_24,
             route = Friends,
         ),
         BottomNavigationItem(
-            titleResId = UiR.string.title_conversations,
+            titleResId = R.string.title_convos,
-            selectedIconResId = UiR.drawable.baseline_chat_24,
+            selectedIconResId = R.drawable.ic_mail_fill_round_24,
-            unselectedIconResId = UiR.drawable.outline_chat_24,
+            unselectedIconResId = R.drawable.ic_mail_round_24,
-            route = Conversations
+            route = ConvoGraph
         ),
         BottomNavigationItem(
-            titleResId = UiR.string.title_profile,
+            titleResId = R.string.title_profile,
-            selectedIconResId = UiR.drawable.baseline_account_circle_24,
+            selectedIconResId = R.drawable.ic_account_circle_fill_round_24,
-            unselectedIconResId = UiR.drawable.outline_account_circle_24,
+            unselectedIconResId = R.drawable.ic_account_circle_round_24,
             route = Profile
         )
     )
@@ -54,11 +52,10 @@ fun NavGraphBuilder.mainScreen(
             navigationItems = navigationItems,
             onError = onError,
             onSettingsButtonClicked = onSettingsButtonClicked,
-            onConversationItemClicked = onConversationClicked,
+            onNavigateToMessagesHistory = onNavigateToMessagesHistory,
             onPhotoClicked = onPhotoClicked,
             onMessageClicked = onMessageClicked,
-            onCreateChatClicked = onCreateChatClicked,
+            onNavigateToCreateChat = onNavigateToCreateChat
-            viewModel = viewModel
         )
     }
 }

app/src/main/kotlin/dev/meloda/fast/presentation/MainActivity.kt

@@ -4,7 +4,6 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
 import android.os.Build
@@ -15,42 +14,20 @@ import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalContext
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.compose.LifecycleResumeEffect
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.conena.nanokt.android.content.pxToDp
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.google.accompanist.permissions.isGranted
-import com.google.accompanist.permissions.rememberPermissionState
 import dev.meloda.fast.MainViewModel
 import dev.meloda.fast.MainViewModelImpl
 import dev.meloda.fast.common.AppConstants
-import dev.meloda.fast.common.LongPollController
-import dev.meloda.fast.common.model.LongPollState
 import dev.meloda.fast.datastore.AppSettings
-import dev.meloda.fast.datastore.UserSettings
 import dev.meloda.fast.service.OnlineService
 import dev.meloda.fast.service.longpolling.LongPollingService
-import dev.meloda.fast.ui.model.DeviceSize
+import dev.meloda.fast.ui.R
-import dev.meloda.fast.ui.model.SizeConfig
-import dev.meloda.fast.ui.model.ThemeConfig
-import dev.meloda.fast.ui.theme.AppTheme
-import dev.meloda.fast.ui.theme.LocalSizeConfig
-import dev.meloda.fast.ui.theme.LocalThemeConfig
-import dev.meloda.fast.ui.util.isNeedToEnableDarkMode
 import org.koin.androidx.compose.koinViewModel
-import org.koin.compose.KoinContext
-import org.koin.compose.koinInject
-import dev.meloda.fast.ui.R as UiR
 
 class MainActivity : AppCompatActivity() {
 
@@ -87,169 +64,33 @@ class MainActivity : AppCompatActivity() {
         requestNotificationPermissions()
 
         setContent {
-            KoinContext {
-                val context = LocalContext.current
-
-                val userSettings: UserSettings = koinInject()
-                val longPollController: LongPollController = koinInject()
-
-                val longPollCurrentState by longPollController.currentState.collectAsStateWithLifecycle()
-                val longPollStateToApply by longPollController.stateToApply.collectAsStateWithLifecycle()
-
             val viewModel: MainViewModel = koinViewModel<MainViewModelImpl>()
+            LaunchedEffect(viewModel) {
+                Log.d("VM_CREATE", "onCreate: viewModel: $viewModel")
+            }
 
             LifecycleResumeEffect(true) {
                 viewModel.onAppResumed(intent)
                 onPauseOrDispose {}
             }
 
-                val permissionState =
+            RootScreen(
-                    rememberPermissionState(permission = Manifest.permission.POST_NOTIFICATIONS)
+                toggleLongPollService = { enable, inBackground ->
-
-                val isNeedToCheckPermission by viewModel.isNeedToCheckNotificationsPermission.collectAsStateWithLifecycle()
-                val isNeedToRequestPermission by viewModel.isNeedToRequestNotifications.collectAsStateWithLifecycle()
-
-                LaunchedEffect(isNeedToCheckPermission) {
-                    if (isNeedToCheckPermission) {
-                        viewModel.onPermissionCheckStatus(permissionState.status)
-
-                        if (permissionState.status.isGranted) {
-                            if (longPollCurrentState == LongPollState.InApp) {
-                                toggleLongPollService(false)
-                            }
-
                     toggleLongPollService(
-                                enable = true,
+                        enable = enable,
-                                inBackground = true
+                        inBackground = inBackground ?: AppSettings.Experimental.longPollInBackground
                     )
-                        }
+                },
-                    }
+                toggleOnlineService = ::toggleOnlineService
-                }
-
-                LaunchedEffect(isNeedToRequestPermission) {
-                    if (isNeedToRequestPermission) {
-                        viewModel.onPermissionsRequested()
-                        permissionState.launchPermissionRequest()
-                    }
-                }
-
-                LaunchedEffect(longPollStateToApply) {
-                    if (longPollStateToApply != LongPollState.Background) {
-                        if (longPollStateToApply.isLaunched() && longPollCurrentState.isLaunched()
-                            && longPollCurrentState != longPollStateToApply
-                        ) {
-                            toggleLongPollService(false)
-                            Log.d("LongPoll", "recreate()")
-                        }
-
-                        toggleLongPollService(
-                            enable = longPollStateToApply.isLaunched(),
-                            inBackground = longPollStateToApply == LongPollState.Background
             )
         }
     }
 
-                val sendOnline by userSettings.sendOnlineStatus.collectAsStateWithLifecycle()
-                LifecycleResumeEffect(sendOnline) {
-                    toggleOnlineService(sendOnline)
-
-                    onPauseOrDispose {
-                        toggleOnlineService(false)
-                    }
-                }
-
-                val deviceWidthDp = remember(true) {
-                    context.resources.displayMetrics.widthPixels.pxToDp()
-                }
-                val deviceHeightDp = remember(true) {
-                    context.resources.displayMetrics.heightPixels.pxToDp()
-                }
-
-                val deviceWidthSize by remember(deviceWidthDp) {
-                    derivedStateOf {
-                        when {
-                            deviceWidthDp <= 360 -> DeviceSize.Small
-                            deviceWidthDp <= 600 -> DeviceSize.Compact
-                            deviceWidthDp <= 840 -> DeviceSize.Medium
-                            else -> DeviceSize.Expanded
-                        }
-                    }
-                }
-
-                val deviceHeightSize by remember(deviceHeightDp) {
-                    derivedStateOf {
-                        when {
-                            deviceHeightDp <= 480 -> DeviceSize.Small
-                            deviceHeightDp <= 700 -> DeviceSize.Compact
-                            deviceHeightDp <= 900 -> DeviceSize.Medium
-                            else -> DeviceSize.Expanded
-                        }
-                    }
-                }
-
-                val sizeConfig by remember(deviceWidthSize, deviceHeightSize) {
-                    mutableStateOf(
-                        SizeConfig(
-                            widthSize = deviceWidthSize,
-                            heightSize = deviceHeightSize
-                        )
-                    )
-                }
-
-                val darkMode by userSettings.darkMode.collectAsStateWithLifecycle()
-                val dynamicColors by userSettings.enableDynamicColors.collectAsStateWithLifecycle()
-                val amoledDark by userSettings.enableAmoledDark.collectAsStateWithLifecycle()
-                val enableBlur by userSettings.useBlur.collectAsStateWithLifecycle()
-                val enableMultiline by userSettings.enableMultiline.collectAsStateWithLifecycle()
-                val useSystemFont by userSettings.useSystemFont.collectAsStateWithLifecycle()
-
-                val setDarkMode = isNeedToEnableDarkMode(darkMode = darkMode)
-
-                val themeConfig by remember(
-                    darkMode,
-                    dynamicColors,
-                    amoledDark,
-                    enableBlur,
-                    enableMultiline,
-                    setDarkMode,
-                    useSystemFont
-                ) {
-                    mutableStateOf(
-                        ThemeConfig(
-                            darkMode = setDarkMode,
-                            dynamicColors = dynamicColors,
-                            selectedColorScheme = 0,
-                            amoledDark = amoledDark,
-                            enableBlur = enableBlur,
-                            enableMultiline = enableMultiline,
-                            useSystemFont = useSystemFont
-                        )
-                    )
-                }
-
-                CompositionLocalProvider(
-                    LocalThemeConfig provides themeConfig,
-                    LocalSizeConfig provides sizeConfig
-                ) {
-                    AppTheme(
-                        useDarkTheme = themeConfig.darkMode,
-                        useDynamicColors = themeConfig.dynamicColors,
-                        selectedColorScheme = themeConfig.selectedColorScheme,
-                        useAmoledBackground = themeConfig.amoledDark,
-                        useSystemFont = themeConfig.useSystemFont
-                    ) {
-                        RootScreen(viewModel = viewModel)
-                    }
-                }
-            }
-        }
-    }
-
     private fun createNotificationChannels() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val noCategoryName = getString(UiR.string.notification_channel_no_category_name)
+            val noCategoryName = getString(R.string.notification_channel_no_category_name)
             val noCategoryDescriptionText =
-                getString(UiR.string.notification_channel_no_category_description)
+                getString(R.string.notification_channel_no_category_description)
             val noCategoryChannel =
                 NotificationChannel(
                     AppConstants.NOTIFICATION_CHANNEL_UNCATEGORIZED,
@@ -259,9 +100,9 @@ class MainActivity : AppCompatActivity() {
                     description = noCategoryDescriptionText
                 }
 
-            val longPollName = getString(UiR.string.notification_channel_long_polling_service_name)
+            val longPollName = getString(R.string.notification_channel_long_polling_service_name)
             val longPollDescriptionText =
-                getString(UiR.string.notification_channel_long_polling_service_description)
+                getString(R.string.notification_channel_long_polling_service_description)
             val longPollChannel =
                 NotificationChannel(
                     AppConstants.NOTIFICATION_CHANNEL_LONG_POLLING,
@@ -272,7 +113,7 @@ class MainActivity : AppCompatActivity() {
                 }
 
             val notificationManager: NotificationManager =
-                getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+                getSystemService(NOTIFICATION_SERVICE) as NotificationManager
 
             notificationManager.createNotificationChannels(
                 listOf(
@@ -292,12 +133,19 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private val longPollingServiceIntent by lazy {
+        Intent(this, LongPollingService::class.java)
+    }
+    private val onlineServiceIntent by lazy {
+        Intent(this, OnlineService::class.java)
+    }
+
     private fun toggleLongPollService(
         enable: Boolean,
         inBackground: Boolean = AppSettings.Experimental.longPollInBackground
     ) {
         if (enable) {
-            val longPollIntent = Intent(this, LongPollingService::class.java)
+            val longPollIntent = longPollingServiceIntent
 
             if (inBackground) {
                 ContextCompat.startForegroundService(this, longPollIntent)
@@ -305,15 +153,15 @@ class MainActivity : AppCompatActivity() {
                 startService(longPollIntent)
             }
         } else {
-            stopService(Intent(this, LongPollingService::class.java))
+            stopService(longPollingServiceIntent)
         }
     }
 
     private fun toggleOnlineService(enable: Boolean) {
         if (enable) {
-            startService(Intent(this, OnlineService::class.java))
+            startService(onlineServiceIntent)
         } else {
-            stopService(Intent(this, OnlineService::class.java))
+            stopService(onlineServiceIntent)
         }
     }
 

app/src/main/kotlin/dev/meloda/fast/presentation/MainScreen.kt

@@ -1,12 +1,14 @@
 package dev.meloda.fast.presentation
 
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.LocalActivity
+import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Icon
@@ -25,9 +27,9 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.navigation
 import androidx.navigation.compose.rememberNavController
@@ -36,8 +38,9 @@ import dev.chrisbanes.haze.HazeState
 import dev.chrisbanes.haze.hazeEffect
 import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
 import dev.chrisbanes.haze.materials.HazeMaterials
-import dev.meloda.fast.MainViewModel
+import dev.meloda.fast.convos.navigation.ConvoGraph
-import dev.meloda.fast.conversations.navigation.conversationsScreen
+import dev.meloda.fast.convos.navigation.convosGraph
+import dev.meloda.fast.friends.navigation.Friends
 import dev.meloda.fast.friends.navigation.friendsScreen
 import dev.meloda.fast.model.BaseError
 import dev.meloda.fast.model.BottomNavigationItem
@@ -45,7 +48,10 @@ import dev.meloda.fast.navigation.MainGraph
 import dev.meloda.fast.profile.navigation.profileScreen
 import dev.meloda.fast.ui.theme.LocalBottomPadding
 import dev.meloda.fast.ui.theme.LocalHazeState
+import dev.meloda.fast.ui.theme.LocalNavController
+import dev.meloda.fast.ui.theme.LocalReselectedTab
 import dev.meloda.fast.ui.theme.LocalThemeConfig
+import dev.meloda.fast.ui.theme.LocalUser
 import dev.meloda.fast.ui.util.ImmutableList
 
 @OptIn(ExperimentalHazeMaterialsApi::class)
@@ -54,38 +60,52 @@ fun MainScreen(
     navigationItems: ImmutableList<BottomNavigationItem>,
     onError: (BaseError) -> Unit = {},
     onSettingsButtonClicked: () -> Unit = {},
-    onConversationItemClicked: (conversationId: Int) -> Unit = {},
+    onNavigateToMessagesHistory: (convoId: Long) -> Unit = {},
     onPhotoClicked: (url: String) -> Unit = {},
-    onMessageClicked: (userId: Int) -> Unit = {},
+    onMessageClicked: (userid: Long) -> Unit = {},
-    onCreateChatClicked: () -> Unit = {},
+    onNavigateToCreateChat: () -> Unit = {}
-    viewModel: MainViewModel
 ) {
-    val currentTheme = LocalThemeConfig.current
+    val activity = LocalActivity.current as? AppCompatActivity ?: return
-    val hazeState = remember { HazeState() }
+    val theme = LocalThemeConfig.current
+    val hazeState = remember { HazeState(true) }
     val navController = rememberNavController()
 
-    val profileImageUrl by viewModel.profileImageUrl.collectAsStateWithLifecycle()
-
     var selectedItemIndex by rememberSaveable {
         mutableIntStateOf(1)
     }
 
+    BackHandler(enabled = selectedItemIndex != 1) {
+        val currentRoute = navigationItems[selectedItemIndex].route
+
+        selectedItemIndex = 1
+        navController.navigate(navigationItems[selectedItemIndex].route) {
+            popUpTo(route = currentRoute) {
+                inclusive = true
+            }
+        }
+    }
+
+    val profileImageUrl = LocalUser.current?.photo100
+
+    var tabReselected by remember {
+        mutableStateOf(navigationItems.associate { it.route to false })
+    }
+
     Scaffold(
         bottomBar = {
             NavigationBar(
                 modifier = Modifier
+                    .fillMaxWidth()
                     .then(
-                        if (currentTheme.enableBlur) {
+                        if (theme.enableBlur) {
                             Modifier.hazeEffect(
                                 state = hazeState,
-                                style = HazeMaterials.thick()
+                                style = HazeMaterials.regular(NavigationBarDefaults.containerColor)
                             )
                         } else Modifier
-                    )
+                    ),
-                    .fillMaxWidth(),
+                containerColor = if (theme.enableBlur) Color.Transparent
-                containerColor = NavigationBarDefaults.containerColor.copy(
+                else NavigationBarDefaults.containerColor
-                    alpha = if (currentTheme.enableBlur) 0f else 1f
-                )
             ) {
                 navigationItems.forEachIndexed { index, item ->
                     NavigationBarItem(
@@ -100,6 +120,10 @@ fun MainScreen(
                                         inclusive = true
                                     }
                                 }
+                            } else {
+                                tabReselected = tabReselected.toMutableMap().also {
+                                    it[navigationItems[index].route] = true
+                                }
                             }
                         },
                         icon = {
@@ -123,9 +147,7 @@ fun MainScreen(
                                         .size(24.dp)
                                         .clip(CircleShape)
                                         .alpha(if (isLoading) 0f else 1f),
-                                    onSuccess = {
+                                    onSuccess = { isLoading = false }
-                                        isLoading = false
-                                    }
                                 )
                             } else {
                                 Icon(
@@ -146,11 +168,12 @@ fun MainScreen(
         Box(
             modifier = Modifier
                 .fillMaxSize()
-                .padding(bottom = if (currentTheme.enableBlur) 0.dp else padding.calculateBottomPadding())
         ) {
             CompositionLocalProvider(
                 LocalHazeState provides hazeState,
-                LocalBottomPadding provides if (currentTheme.enableBlur) padding.calculateBottomPadding() else 0.dp
+                LocalBottomPadding provides padding.calculateBottomPadding(),
+                LocalReselectedTab provides tabReselected,
+                LocalNavController provides navController
             ) {
                 NavHost(
                     navController = navController,
@@ -164,23 +187,32 @@ fun MainScreen(
                         exitTransition = { fadeOut(animationSpec = tween(200)) }
                     ) {
                         friendsScreen(
+                            activity = activity,
                             onError = onError,
-                            navController = navController,
                             onPhotoClicked = onPhotoClicked,
-                            onMessageClicked = onMessageClicked
+                            onMessageClicked = onMessageClicked,
+                            onScrolledToTop = {
+                                tabReselected = tabReselected.toMutableMap().also {
+                                    it[Friends] = false
+                                }
+                            },
                         )
-                        conversationsScreen(
+                        convosGraph(
+                            activity = activity,
                             onError = onError,
-                            onConversationItemClicked = onConversationItemClicked,
+                            onNavigateToMessagesHistory = onNavigateToMessagesHistory,
-                            onPhotoClicked = onPhotoClicked,
+                            onNavigateToCreateChat = onNavigateToCreateChat,
-                            onCreateChatClicked = onCreateChatClicked,
+                            onScrolledToTop = {
-                            navController = navController,
+                                tabReselected = tabReselected.toMutableMap().also {
+                                    it[ConvoGraph] = false
+                                }
+                            }
                         )
                         profileScreen(
+                            activity = activity,
                             onError = onError,
                             onSettingsButtonClicked = onSettingsButtonClicked,
-                            onPhotoClicked = onPhotoClicked,
+                            onPhotoClicked = onPhotoClicked
-                            navController = navController
                         )
                     }
                 }

app/src/main/kotlin/dev/meloda/fast/presentation/RootScreen.kt

@@ -1,49 +1,243 @@
 package dev.meloda.fast.presentation
 
+import android.Manifest
 import android.content.Intent
 import android.net.Uri
 import android.provider.Settings
+import android.util.Log
+import androidx.activity.compose.LocalActivity
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.compose.LifecycleResumeEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
+import com.conena.nanokt.android.content.pxToDp
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
 import dev.meloda.fast.MainViewModel
+import dev.meloda.fast.MainViewModelImpl
 import dev.meloda.fast.auth.authNavGraph
+import dev.meloda.fast.auth.captcha.presentation.CaptchaScreen
 import dev.meloda.fast.auth.navigateToAuth
 import dev.meloda.fast.chatmaterials.navigation.chatMaterialsScreen
 import dev.meloda.fast.chatmaterials.navigation.navigateToChatMaterials
-import dev.meloda.fast.conversations.navigation.createChatScreen
+import dev.meloda.fast.common.LongPollController
-import dev.meloda.fast.conversations.navigation.navigateToCreateChat
+import dev.meloda.fast.common.model.LongPollState
+import dev.meloda.fast.convos.navigation.createChatScreen
+import dev.meloda.fast.convos.navigation.navigateToCreateChat
+import dev.meloda.fast.datastore.AppSettings
+import dev.meloda.fast.datastore.CaptchaTokenResult
+import dev.meloda.fast.datastore.UserSettings
 import dev.meloda.fast.languagepicker.navigation.languagePickerScreen
 import dev.meloda.fast.languagepicker.navigation.navigateToLanguagePicker
 import dev.meloda.fast.messageshistory.navigation.messagesHistoryScreen
 import dev.meloda.fast.messageshistory.navigation.navigateToMessagesHistory
+import dev.meloda.fast.model.api.domain.VkUser
 import dev.meloda.fast.navigation.Main
 import dev.meloda.fast.navigation.mainScreen
-import dev.meloda.fast.photoviewer.navigation.navigateToPhotoView
+import dev.meloda.fast.photoviewer.presentation.PhotoViewDialog
-import dev.meloda.fast.photoviewer.navigation.photoViewScreen
 import dev.meloda.fast.settings.navigation.navigateToSettings
 import dev.meloda.fast.settings.navigation.settingsScreen
 import dev.meloda.fast.ui.R
+import dev.meloda.fast.ui.common.LocalSizeConfig
+import dev.meloda.fast.ui.model.DeviceSize
+import dev.meloda.fast.ui.model.SizeConfig
+import dev.meloda.fast.ui.model.ThemeConfig
+import dev.meloda.fast.ui.theme.AppTheme
+import dev.meloda.fast.ui.theme.LocalNavController
+import dev.meloda.fast.ui.theme.LocalNavRootController
+import dev.meloda.fast.ui.theme.LocalThemeConfig
+import dev.meloda.fast.ui.theme.LocalUser
+import dev.meloda.fast.ui.util.ImmutableList.Companion.toImmutableList
+import dev.meloda.fast.ui.util.isNeedToEnableDarkMode
+import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.koinInject
 
+@OptIn(ExperimentalPermissionsApi::class)
 @Composable
 fun RootScreen(
-    navController: NavHostController = rememberNavController(),
+    toggleLongPollService: (enable: Boolean, inBackground: Boolean?) -> Unit,
-    viewModel: MainViewModel
+    toggleOnlineService: (enable: Boolean) -> Unit
 ) {
+    val resources = LocalResources.current
+
+    val userSettings: UserSettings = koinInject()
+    val longPollController: LongPollController = koinInject()
+
+    val longPollCurrentState by longPollController.currentState.collectAsStateWithLifecycle()
+    val longPollStateToApply by longPollController.stateToApply.collectAsStateWithLifecycle()
+
+    val viewModel: MainViewModel = koinViewModel<MainViewModelImpl>()
+    LaunchedEffect(viewModel) {
+        Log.d("VM_CREATE", "RootScreen(): viewModel: $viewModel")
+    }
+
+    val currentUser: VkUser? by viewModel.currentUser.collectAsStateWithLifecycle()
+
+    val permissionState =
+        rememberPermissionState(permission = Manifest.permission.POST_NOTIFICATIONS)
+
+    val isNeedToCheckPermission by viewModel.isNeedToCheckNotificationsPermission.collectAsStateWithLifecycle()
+    val isNeedToRequestPermission by viewModel.isNeedToRequestNotifications.collectAsStateWithLifecycle()
+
+    LaunchedEffect(isNeedToCheckPermission) {
+        if (isNeedToCheckPermission) {
+            viewModel.onPermissionCheckStatus(permissionState.status)
+
+            if (permissionState.status.isGranted) {
+                if (longPollCurrentState == LongPollState.InApp) {
+                    toggleLongPollService(false, null)
+                }
+
+                toggleLongPollService(true, true)
+            }
+        }
+    }
+
+    LaunchedEffect(isNeedToRequestPermission) {
+        if (isNeedToRequestPermission) {
+            viewModel.onPermissionsRequested()
+            permissionState.launchPermissionRequest()
+        }
+    }
+
+    LifecycleResumeEffect(longPollStateToApply) {
+        Log.d("LongPollMainActivity", "longPollStateToApply: $longPollStateToApply")
+        if (longPollStateToApply != LongPollState.Background) {
+            if (longPollStateToApply.isLaunched() && longPollCurrentState.isLaunched()
+                && longPollCurrentState != longPollStateToApply
+            ) {
+                toggleLongPollService(false, null)
+                Log.d("LongPoll", "recreate()")
+            }
+
+            toggleLongPollService(
+                longPollStateToApply.isLaunched(),
+                longPollStateToApply == LongPollState.Background
+            )
+        }
+
+        onPauseOrDispose {}
+    }
+
+    val sendOnline by userSettings.sendOnlineStatus.collectAsStateWithLifecycle()
+    LifecycleResumeEffect(sendOnline) {
+        toggleOnlineService(sendOnline)
+
+        onPauseOrDispose {
+            toggleOnlineService(false)
+        }
+    }
+
+    val deviceWidthDp = remember(true) {
+        resources.displayMetrics.widthPixels.pxToDp()
+    }
+    val deviceHeightDp = remember(true) {
+        resources.displayMetrics.heightPixels.pxToDp()
+    }
+
+    val deviceWidthSize by remember(deviceWidthDp) {
+        derivedStateOf {
+            when {
+                deviceWidthDp <= 360 -> DeviceSize.Small
+                deviceWidthDp <= 600 -> DeviceSize.Compact
+                deviceWidthDp <= 840 -> DeviceSize.Medium
+                else -> DeviceSize.Expanded
+            }
+        }
+    }
+
+    val deviceHeightSize by remember(deviceHeightDp) {
+        derivedStateOf {
+            when {
+                deviceHeightDp <= 480 -> DeviceSize.Small
+                deviceHeightDp <= 700 -> DeviceSize.Compact
+                deviceHeightDp <= 900 -> DeviceSize.Medium
+                else -> DeviceSize.Expanded
+            }
+        }
+    }
+
+    val sizeConfig by remember(deviceWidthSize, deviceHeightSize) {
+        mutableStateOf(
+            SizeConfig(
+                widthSize = deviceWidthSize,
+                heightSize = deviceHeightSize
+            )
+        )
+    }
+
+    val darkMode by userSettings.darkMode.collectAsStateWithLifecycle()
+    val dynamicColors by userSettings.enableDynamicColors.collectAsStateWithLifecycle()
+    val amoledDark by userSettings.enableAmoledDark.collectAsStateWithLifecycle()
+    val enableBlur by userSettings.useBlur.collectAsStateWithLifecycle()
+    val enableMultiline by userSettings.enableMultiline.collectAsStateWithLifecycle()
+    val useSystemFont by userSettings.useSystemFont.collectAsStateWithLifecycle()
+    val enableAnimations by userSettings.enableAnimations.collectAsStateWithLifecycle()
+
+    val setDarkMode = isNeedToEnableDarkMode(darkMode = darkMode)
+
+    val themeConfig by remember(
+        darkMode,
+        dynamicColors,
+        amoledDark,
+        enableBlur,
+        enableMultiline,
+        setDarkMode,
+        useSystemFont
+    ) {
+        derivedStateOf {
+            ThemeConfig(
+                darkMode = setDarkMode,
+                dynamicColors = dynamicColors,
+                selectedColorScheme = 0,
+                amoledDark = amoledDark,
+                enableBlur = enableBlur,
+                enableMultiline = enableMultiline,
+                useSystemFont = useSystemFont,
+                enableAnimations = enableAnimations
+            )
+        }
+    }
+
+    CompositionLocalProvider(
+        LocalThemeConfig provides themeConfig,
+        LocalSizeConfig provides sizeConfig,
+        LocalUser provides currentUser
+    ) {
+        AppTheme(
+            useDarkTheme = themeConfig.darkMode,
+            useDynamicColors = themeConfig.dynamicColors,
+            selectedColorScheme = themeConfig.selectedColorScheme,
+            useAmoledBackground = themeConfig.amoledDark,
+            useSystemFont = themeConfig.useSystemFont
+        ) {
+            val navController: NavHostController = rememberNavController()
+            val activity = LocalActivity.current
             val context = LocalContext.current
             val startDestination by viewModel.startDestination.collectAsStateWithLifecycle()
             val isNeedToOpenAuth by viewModel.isNeedToReplaceWithAuth.collectAsStateWithLifecycle()
@@ -111,6 +305,18 @@ fun RootScreen(
             }
 
             if (startDestination != null) {
+                CompositionLocalProvider(
+                    LocalNavRootController provides navController,
+                    LocalNavController provides navController
+                ) {
+                    var photoViewerInfo by rememberSaveable {
+                        mutableStateOf<Pair<List<String>, Int?>?>(null)
+                    }
+
+                    val captchaRedirectUri by AppSettings.getCaptchaRedirectUriFlow()
+                        .collectAsStateWithLifecycle()
+
+                    Box(modifier = Modifier.fillMaxSize()) {
                         NavHost(
                             navController = navController,
                             startDestination = requireNotNull(startDestination),
@@ -118,32 +324,43 @@ fun RootScreen(
                             exitTransition = { fadeOut(animationSpec = tween(200)) }
                         ) {
                             authNavGraph(
-                onNavigateToMain = navController::navigateToMain,
+                                onNavigateToMain = {
+                                    viewModel.onUserAuthenticated()
+                                    navController.navigateToMain()
+                                },
+                                onNavigateToSettings = navController::navigateToSettings,
                                 navController = navController
                             )
+
                             mainScreen(
                                 onError = viewModel::onError,
                                 onSettingsButtonClicked = navController::navigateToSettings,
-                onConversationClicked = navController::navigateToMessagesHistory,
+                                onNavigateToMessagesHistory = navController::navigateToMessagesHistory,
-                onPhotoClicked = { url -> navController.navigateToPhotoView(listOf(url)) },
+                                onPhotoClicked = { url ->
+                                    photoViewerInfo = listOf(url) to null
+                                },
                                 onMessageClicked = navController::navigateToMessagesHistory,
-                onCreateChatClicked = navController::navigateToCreateChat,
+                                onNavigateToCreateChat = navController::navigateToCreateChat,
-                viewModel = viewModel
                             )
 
                             messagesHistoryScreen(
                                 onError = viewModel::onError,
                                 onBack = navController::navigateUp,
-                onChatMaterialsDropdownItemClicked = navController::navigateToChatMaterials
+                                onNavigateToChatMaterials = navController::navigateToChatMaterials,
+                                onNavigateToPhotoViewer = { photos, index ->
+                                    photoViewerInfo = photos to index
+                                }
                             )
                             chatMaterialsScreen(
                                 onBack = navController::navigateUp,
-                onPhotoClicked = { url -> navController.navigateToPhotoView(listOf(url)) }
+                                onPhotoClicked = { url ->
+                                    photoViewerInfo = listOf(url) to null
+                                }
                             )
                             createChatScreen(
-                onChatCreated = { conversationId ->
+                                onChatCreated = { convoId ->
                                     navController.popBackStack()
-                    navController.navigateToMessagesHistory(conversationId)
+                                    navController.navigateToMessagesHistory(convoId)
                                 },
                                 navController = navController
                             )
@@ -151,11 +368,40 @@ fun RootScreen(
                             settingsScreen(
                                 onBack = navController::navigateUp,
                                 onLogOutButtonClicked = { navController.navigateToAuth(true) },
-                onLanguageItemClicked = navController::navigateToLanguagePicker
+                                onLanguageItemClicked = navController::navigateToLanguagePicker,
+                                onRestartRequired = {
+                                    activity?.let {
+                                        val intent = Intent(activity, MainActivity::class.java)
+                                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                                        activity.startActivity(intent)
+                                        activity.finish()
+                                    }
+                                }
                             )
                             languagePickerScreen(onBack = navController::navigateUp)
+                        }
 
-            photoViewScreen(onBack = navController::navigateUp)
+                        PhotoViewDialog(
+                            photoViewerInfo = photoViewerInfo?.let { info ->
+                                info.first.toImmutableList() to info.second
+                            },
+                            onDismiss = { photoViewerInfo = null }
+                        )
+
+                        CaptchaScreen(
+                            captchaRedirectUri = captchaRedirectUri,
+                            onBack = {
+                                AppSettings.setCaptchaResult(CaptchaTokenResult.Cancelled)
+                            },
+                            onResult = { result ->
+                                AppSettings.setCaptchaResult(
+                                    CaptchaTokenResult.Success(result)
+                                )
+                            },
+                        )
+                    }
+                }
+            }
         }
     }
 }

app/src/main/kotlin/dev/meloda/fast/service/longpolling/LongPollingService.kt

@@ -16,11 +16,11 @@ import dev.meloda.fast.common.LongPollController
 import dev.meloda.fast.common.VkConstants
 import dev.meloda.fast.common.extensions.listenValue
 import dev.meloda.fast.common.model.LongPollState
-import dev.meloda.fast.domain.LongPollUpdatesParser
-import dev.meloda.fast.domain.LongPollUseCase
 import dev.meloda.fast.data.UserConfig
 import dev.meloda.fast.data.processState
 import dev.meloda.fast.datastore.AppSettings
+import dev.meloda.fast.domain.LongPollUpdatesParser
+import dev.meloda.fast.domain.LongPollUseCase
 import dev.meloda.fast.model.api.data.LongPollUpdates
 import dev.meloda.fast.model.api.data.VkLongPollData
 import dev.meloda.fast.ui.R
@@ -30,11 +30,13 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
 import org.koin.android.ext.android.inject
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
+import kotlin.time.Duration.Companion.seconds
 
 class LongPollingService : Service() {
 
@@ -42,15 +44,9 @@ class LongPollingService : Service() {
 
     private val job = SupervisorJob()
 
-    private val exceptionHandler = CoroutineExceptionHandler { _, throwable ->
+    private val exceptionHandler =
-        Log.e(TAG, "error: $throwable")
+        CoroutineExceptionHandler { _, throwable ->
-
+            handleError(throwable)
-        if (throwable !is NoAccessTokenException) {
-            throwable.printStackTrace()
-        }
-
-        longPollController.updateCurrentState(LongPollState.Exception)
-        longPollController.setStateToApply(LongPollState.Exception)
         }
 
     private val coroutineContext: CoroutineContext
@@ -63,6 +59,8 @@ class LongPollingService : Service() {
 
     private var currentJob: Job? = null
 
+    private val inBackground get() = AppSettings.Experimental.longPollInBackground
+
     override fun onCreate() {
         super.onCreate()
         Log.d(STATE_TAG, "onCreate()")
@@ -76,21 +74,12 @@ class LongPollingService : Service() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         if (startId > 1) return START_STICKY
 
-        val inBackground = AppSettings.Experimental.longPollInBackground
-
         Log.d(
             STATE_TAG,
             "onStartCommand: asForeground: $inBackground; flags: $flags; startId: $startId;\ninstance: $this"
         )
 
-        if (currentJob != null) {
+        startJob()
-            currentJob?.cancel()
-            currentJob = null
-        }
-
-        coroutineScope.launch {
-            currentJob = startPolling().also { it.join() }
-        }
 
         val openCategorySettingsIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
@@ -108,11 +97,6 @@ class LongPollingService : Service() {
             PendingIntent.FLAG_IMMUTABLE
         )
 
-        longPollController.updateCurrentState(
-            if (inBackground) LongPollState.Background
-            else LongPollState.InApp
-        )
-
         if (inBackground) {
             val notification =
                 NotificationsUtils.createNotification(
@@ -134,17 +118,33 @@ class LongPollingService : Service() {
         return START_STICKY
     }
 
+    private fun startJob() {
+        if (currentJob != null) {
+            currentJob?.cancel()
+            currentJob = null
+        }
+
+        coroutineScope.launch {
+            currentJob = startPolling().also { it.join() }
+        }
+    }
+
     private fun startPolling(): Job {
         if (job.isCompleted || job.isCancelled) {
-            Log.d(STATE_TAG, "job is completed or cancelled")
+            Log.d(STATE_TAG, "Job is completed or cancelled")
             throw Exception("Job is over")
         }
 
-        Log.d(STATE_TAG, "job started")
+        Log.d(STATE_TAG, "Starting job...")
+
+        return coroutineScope.launch(coroutineContext) {
+            longPollController.updateCurrentState(
+                if (inBackground) LongPollState.Background
+                else LongPollState.InApp
+            )
 
-        return coroutineScope.launch {
             if (UserConfig.accessToken.isEmpty()) {
-                throw NoAccessTokenException
+                throw NoAccessTokenException()
             }
 
             var serverInfo = getServerInfo()
@@ -204,7 +204,7 @@ class LongPollingService : Service() {
         }
     }
 
-    private suspend fun getServerInfo(): VkLongPollData? = suspendCoroutine {
+    private suspend fun getServerInfo(): VkLongPollData? = suspendCancellableCoroutine {
         longPollUseCase.getLongPollServer(
             needPts = true,
             version = VkConstants.LP_VERSION
@@ -224,7 +224,7 @@ class LongPollingService : Service() {
 
     private suspend fun getUpdatesResponse(
         server: VkLongPollData
-    ): LongPollUpdates? = suspendCoroutine {
+    ): LongPollUpdates? = suspendCancellableCoroutine {
         longPollUseCase.getLongPollUpdates(
             serverUrl = "https://${server.server}",
             key = server.key,
@@ -246,6 +246,21 @@ class LongPollingService : Service() {
         }
     }
 
+    private fun handleError(throwable: Throwable) {
+        Log.e(TAG, "error: $throwable")
+
+        if (throwable !is NoAccessTokenException) {
+            throwable.printStackTrace()
+        }
+
+        coroutineScope.launch {
+            delay(5.seconds)
+            startJob()
+        }
+
+        longPollController.updateCurrentState(LongPollState.Exception)
+    }
+
     override fun onDestroy() {
         Log.d(STATE_TAG, "onDestroy")
         longPollController.updateCurrentState(LongPollState.Stopped)
@@ -259,8 +274,7 @@ class LongPollingService : Service() {
     }
 
     override fun onTrimMemory(level: Int) {
-        Log.d(STATE_TAG, "onTrimMemory")
+        Log.d(STATE_TAG, "onTrimMemory. Level: $level")
-        longPollController.updateCurrentState(LongPollState.Stopped)
         super.onTrimMemory(level)
     }
 
@@ -276,4 +290,4 @@ class LongPollingService : Service() {
 }
 
 private data class LongPollException(override val message: String) : Throwable()
-private data object NoAccessTokenException : Throwable()
+private class NoAccessTokenException : Throwable()

app/src/main/kotlin/dev/meloda/fast/util/NotificationsUtils.kt

@@ -6,7 +6,7 @@ import android.content.Context
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import dev.meloda.fast.common.AppConstants
-import dev.meloda.fast.ui.R as UiR
+import dev.meloda.fast.ui.R
 
 object NotificationsUtils {
 
@@ -28,7 +28,7 @@ object NotificationsUtils {
         actions: List<NotificationCompat.Action> = emptyList(),
     ): NotificationCompat.Builder {
         val builder = NotificationCompat.Builder(context, channelId)
-            .setSmallIcon(UiR.drawable.ic_fast_logo)
+            .setSmallIcon(R.drawable.ic_fast_logo)
             .setContentTitle(title)
             .setPriority(priority.value)
             .setContentIntent(contentIntent)

app/src/main/res/xml/network_security_config.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config xmlns:tools="http://schemas.android.com/tools">
-    <!-- Allow cleartext network traffic -->
     <base-config
-        cleartextTrafficPermitted="true"
+        cleartextTrafficPermitted="false"
         tools:ignore="InsecureBaseConfiguration">
         <trust-anchors>
             <!-- Trust pre-installed CAs -->

build-logic/convention/build.gradle.kts

@@ -7,13 +7,13 @@ plugins {
 group = "dev.meloda.fast.buildlogic"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 kotlin {
     compilerOptions {
-        jvmTarget = JvmTarget.JVM_17
+        jvmTarget = JvmTarget.JVM_21
     }
 }
 

build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt

@@ -10,6 +10,7 @@ class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
         with(target) {
             apply(plugin = "com.android.application")
             apply(plugin = "org.jetbrains.kotlin.plugin.compose")
+            apply(plugin = "com.github.skydoves.compose.stability.analyzer")
 
             val extension = extensions.getByType<ApplicationExtension>()
             configureAndroidCompose(extension)

build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt

@@ -1,6 +1,6 @@
 import com.android.build.api.dsl.ApplicationExtension
 import dev.meloda.fast.configureKotlinAndroid
-import dev.meloda.fast.libs
+import dev.meloda.fast.getVersionInt
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -10,12 +10,18 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.application")
-                apply("org.jetbrains.kotlin.android")
             }
 
             extensions.configure<ApplicationExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = libs.findVersion("targetSdk").get().toString().toInt()
+                defaultConfig {
+                    minSdk = getVersionInt("minSdk")
+                    compileSdk = getVersionInt("compileSdk")
+                    targetSdk = getVersionInt("targetSdk")
+                }
+                lint {
+                    abortOnError = false
+                }
             }
         }
     }

build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt

@@ -1,18 +1,26 @@
-import com.android.build.gradle.LibraryExtension
+import com.android.build.api.dsl.LibraryExtension
 import dev.meloda.fast.configureAndroidCompose
+import dev.meloda.fast.getVersionInt
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.configure
 
 class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             apply(plugin = "com.android.library")
             apply(plugin = "org.jetbrains.kotlin.plugin.compose")
+            apply(plugin = "com.github.skydoves.compose.stability.analyzer")
 
-            val extension = extensions.getByType<LibraryExtension>()
+            extensions.configure<LibraryExtension> {
-            configureAndroidCompose(extension)
+                configureAndroidCompose(this)
+                androidResources.enable = false
+                defaultConfig {
+                    minSdk = getVersionInt("minSdk")
+                    compileSdk = getVersionInt("compileSdk")
+                }
+            }
         }
     }
 }

build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt

@@ -1,8 +1,8 @@
+import com.android.build.api.dsl.LibraryExtension
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
-import com.android.build.gradle.LibraryExtension
 import dev.meloda.fast.configureKotlinAndroid
 import dev.meloda.fast.disableUnnecessaryAndroidTests
-import dev.meloda.fast.libs
+import dev.meloda.fast.getVersionInt
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -14,15 +14,20 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.library")
-                apply("org.jetbrains.kotlin.android")
                 apply("org.jetbrains.kotlin.plugin.parcelize")
                 apply("org.jetbrains.kotlin.plugin.serialization")
             }
 
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = libs.findVersion("targetSdk").get().toString().toInt()
+                androidResources.enable = false
-                defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+                defaultConfig {
+                    minSdk = getVersionInt("minSdk")
+                    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+                }
+                lint {
+                    abortOnError = false
+                }
             }
             extensions.configure<LibraryAndroidComponentsExtension> {
                 disableUnnecessaryAndroidTests(target)

build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt

@@ -1,6 +1,6 @@
-import com.android.build.gradle.TestExtension
+import com.android.build.api.dsl.TestExtension
 import dev.meloda.fast.configureKotlinAndroid
-import dev.meloda.fast.libs
+import dev.meloda.fast.getVersionInt
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -10,12 +10,15 @@ class AndroidTestConventionPlugin : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.test")
-                apply("org.jetbrains.kotlin.android")
             }
 
             extensions.configure<TestExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = libs.findVersion("targetSdk").get().toString().toInt()
+                defaultConfig {
+                    minSdk = getVersionInt("minSdk")
+                    compileSdk = getVersionInt("compileSdk")
+                    targetSdk = getVersionInt("targetSdk")
+                }
             }
         }
     }

build-logic/convention/src/main/kotlin/dev/meloda/fast/AndroidCompose.kt

@@ -5,12 +5,10 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 
 internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *, *, *>,
+    commonExtension: CommonExtension,
 ) {
     commonExtension.apply {
-        buildFeatures {
+        buildFeatures.compose = true
-            compose = true
-        }
 
         dependencies {
             val bom = libs.findLibrary("compose-bom").get()

build-logic/convention/src/main/kotlin/dev/meloda/fast/KotlinAndroid.kt

@@ -1,6 +1,9 @@
 package dev.meloda.fast
 
+import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.CompileOptions
+import com.android.build.api.dsl.LibraryExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
@@ -13,28 +16,29 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *, *>,
+    commonExtension: CommonExtension,
 ) {
+    when (commonExtension) {
+        is ApplicationExtension -> commonExtension.compileOptions(buildCompileOptions())
+        is LibraryExtension -> commonExtension.compileOptions(buildCompileOptions())
+    }
+
     commonExtension.apply {
-        compileSdk = libs.findVersion("compileSdk").get().toString().toInt()
+        compileSdk = getVersionInt("compileSdk")
-
-        defaultConfig {
-            minSdk = libs.findVersion("minSdk").get().toString().toInt()
-        }
-
-        compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_17
-            targetCompatibility = JavaVersion.VERSION_17
-        }
     }
 
     configureKotlin<KotlinAndroidProjectExtension>()
 }
 
+private fun buildCompileOptions(): CompileOptions.() -> Unit = {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
 internal fun Project.configureKotlinJvm() {
     extensions.configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     configureKotlin<KotlinJvmProjectExtension>()
@@ -47,15 +51,17 @@ private inline fun <reified T : KotlinBaseExtension> Project.configureKotlin() =
     when (this) {
         is KotlinAndroidProjectExtension -> compilerOptions
         is KotlinJvmProjectExtension -> compilerOptions
-        else -> TODO("Unsupported project extension $this ${T::class}")
+        else -> throw IllegalArgumentException("Unsupported project extension $this ${T::class}")
     }.apply {
-        jvmTarget = JvmTarget.JVM_17
+        jvmTarget = JvmTarget.JVM_21
         allWarningsAsErrors = warningsAsErrors.toBoolean()
         freeCompilerArgs.addAll(
             "-opt-in=kotlin.RequiresOptIn",
             // Enable experimental coroutines APIs, including Flow
             "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-opt-in=kotlinx.coroutines.FlowPreview"
+            "-opt-in=kotlinx.coroutines.FlowPreview",
+            "-Xannotation-default-target=param-property",
+            "-Xcontext-parameters"
         )
     }
 }

build-logic/convention/src/main/kotlin/dev/meloda/fast/ProjectExtensions.kt

@@ -7,3 +7,8 @@ import org.gradle.kotlin.dsl.getByType
 
 val Project.libs
     get(): VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+
+fun Project.getVersionInt(alias: String): Int {
+    return libs.findVersion(alias).get().requiredVersion.toInt()
+}

build.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.kotlin.jvm) apply false
@@ -9,4 +8,6 @@ plugins {
     alias(libs.plugins.room) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.module.graph) apply true
+    alias(libs.plugins.versions) apply true
+    alias(libs.plugins.stability.analyzer) apply false
 }

core/common/src/main/kotlin/dev/meloda/fast/common/AppConstants.kt

@@ -4,9 +4,9 @@ object AppConstants {
 
     const val INSTALL_APP_MIME_TYPE = "application/vnd.android.package-archive"
     
-    const val API_VERSION = "5.173"
+    const val API_VERSION = "5.238"
-    const val URL_OAUTH = "https://oauth.vk.com"
+    const val URL_OAUTH = "https://oauth.vk.ru"
-    const val URL_API = "https://api.vk.com/method"
+    const val URL_API = "https://api.vk.ru/method"
 
     const val NOTIFICATION_CHANNEL_UNCATEGORIZED = "uncategorized"
     const val NOTIFICATION_CHANNEL_LONG_POLLING = "long_polling"

core/common/src/main/kotlin/dev/meloda/fast/common/VkConstants.kt

@@ -5,12 +5,12 @@ object VkConstants {
     const val GROUP_FIELDS = "description,members_count,counters,status,verified"
 
     const val USER_FIELDS =
-        "photo_50,photo_100,photo_200,photo_400_orig,status,screen_name,online,online_mobile,last_seen,verified,sex,online_info,bdate"
+        "photo_50,photo_100,photo_200,photo_400_orig,status,screen_name,online_info,last_seen,verified,sex,bdate"
 
     const val ALL_FIELDS =
         "$USER_FIELDS,$GROUP_FIELDS"
 
-    const val LP_VERSION = 10
+    const val LP_VERSION = 19
 
     const val VK_APP_ID = "2274003"
     const val VK_SECRET = "hHbZxrka2uZ6jB1inYsH"
@@ -18,6 +18,11 @@ object VkConstants {
     const val FAST_GROUP_ID = -119516304
     const val FAST_APP_ID = "6964679"
 
+    const val MESSENGER_APP_ID = 51453752
+    const val MESSENGER_APP_SECRET = "4UyuCUsdK8pVCNoeQuGi"
+
+    const val MESSENGER_APP_SCOPE = 1454174
+
     object Auth {
         const val SCOPE = "notify," +
                 "friends," +

core/common/src/main/kotlin/dev/meloda/fast/common/extensions/Extensions.kt

@@ -1,5 +1,7 @@
 package dev.meloda.fast.common.extensions
 
+import android.os.Build
+import android.os.Bundle
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
@@ -11,6 +13,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.update
+import kotlin.reflect.KClass
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
@@ -23,6 +26,20 @@ fun <T> MutableList<T>.addIf(element: T, condition: () -> Boolean) {
     if (condition.invoke()) add(element)
 }
 
+fun <T> MutableList<T>.removeIfCompat(condition: (T) -> Boolean): Boolean {
+    var removed = false
+
+    val each = iterator()
+    while (each.hasNext()) {
+        if (condition(each.next())) {
+            each.remove()
+            removed = true
+        }
+    }
+
+    return removed
+}
+
 fun <T> Flow<T>.listenValue(
     coroutineScope: CoroutineScope,
     action: suspend (T) -> Unit
@@ -75,6 +92,11 @@ fun <T> MutableStateFlow<T>.setValue(function: (T) -> T) {
     update { newValue }
 }
 
+fun <T> MutableStateFlow<T>.updateValue(block: T.() -> T) {
+    val newValue = block(value)
+    update { newValue }
+}
+
 fun Any.asInt(): Int {
     return when (this) {
         is Number -> this.toInt()
@@ -83,6 +105,14 @@ fun Any.asInt(): Int {
     }
 }
 
+fun Any.asLong(): Long {
+    return when (this) {
+        is Number -> this.toLong()
+
+        else -> throw IllegalArgumentException("Object is not numeric")
+    }
+}
+
 fun <T> Any.toList(mapper: (old: Any) -> T): List<T> {
     return when (this) {
         is List<*> -> this.mapNotNull { it?.run(mapper) }
@@ -90,3 +120,33 @@ fun <T> Any.toList(mapper: (old: Any) -> T): List<T> {
         else -> emptyList()
     }
 }
+
+fun <T> Bundle.getParcelableCompat(key: String, clazz: Class<T>): T? {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        getParcelable(key, clazz)
+    } else {
+        @Suppress("DEPRECATION")
+        getParcelable(key)
+    }
+}
+
+fun <T : Any> Bundle.getParcelableCompat(key: String, clazz: KClass<T>): T? {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        getParcelable(key, clazz.java)
+    } else {
+        @Suppress("DEPRECATION")
+        getParcelable(key)
+    }
+}
+
+infix fun ClosedRange<Int>.collidesWith(other: ClosedRange<Int>): Boolean {
+    return this.start < other.endInclusive && other.start < this.endInclusive
+}
+
+operator fun ClosedRange<Int>.minus(other: ClosedRange<Int>): ClosedRange<Int> {
+    return (this.start - other.start)..(this.endInclusive - other.endInclusive)
+}
+
+operator fun ClosedRange<Int>.minus(other: Int): ClosedRange<Int> {
+    return (this.start - other)..(this.endInclusive - other)
+}

core/common/src/main/kotlin/dev/meloda/fast/common/util/TimeUtils.kt

@@ -1,19 +1,22 @@
 package dev.meloda.fast.common.util
 
-import android.content.res.Resources
 import com.conena.nanokt.jvm.util.dayOfMonth
-import com.conena.nanokt.jvm.util.hour
 import com.conena.nanokt.jvm.util.hourOfDay
 import com.conena.nanokt.jvm.util.millisecond
 import com.conena.nanokt.jvm.util.minute
 import com.conena.nanokt.jvm.util.month
 import com.conena.nanokt.jvm.util.second
 import com.conena.nanokt.jvm.util.year
-import dev.meloda.fast.common.R
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
+import kotlin.time.Clock
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.Instant
 
 object TimeUtils {
 
@@ -27,7 +30,11 @@ object TimeUtils {
         }.timeInMillis
     }
 
-    fun getLocalizedDate(resources: Resources, date: Long): String {
+    fun getLocalizedDate(
+        date: Long,
+        yesterday: () -> String,
+        today: () -> String
+    ): String {
         val now = Calendar.getInstance()
         val then = Calendar.getInstance().also { it.timeInMillis = date }
 
@@ -36,48 +43,41 @@ object TimeUtils {
             now.month != then.month -> "dd MMMM"
             now.dayOfMonth != then.dayOfMonth -> {
                 if (now.dayOfMonth - then.dayOfMonth == 1) {
-                    return resources.getString(R.string.yesterday)
+                    return yesterday()
                 } else {
                     "dd MMMM"
                 }
             }
 
-            else -> return resources.getString(R.string.today)
+            else -> return today()
         }
 
         return SimpleDateFormat(pattern, Locale.getDefault()).format(date)
     }
 
-    fun getLocalizedTime(resources: Resources, date: Long): String {
+    fun getLocalizedTime(
-        val now = Calendar.getInstance()
+        date: Long,
-        val then = Calendar.getInstance().also { it.timeInMillis = date }
+        yearShort: () -> String,
+        monthShort: () -> String,
+        weekShort: () -> String,
+        dayShort: () -> String,
+        minuteShort: () -> String,
+        secondShort: () -> String,
+        now: () -> String
+    ): String {
+        val now = Clock.System.now()
+        val then = Instant.fromEpochMilliseconds(date)
+        val diff = now - then
 
         return when {
-            now.year != then.year -> {
+            diff > 365.days -> "${diff.inWholeDays / 365}${yearShort().lowercase()}"
-                "${now.year - then.year}${resources.getString(R.string.year_short).lowercase()}"
+            diff > 30.days -> "${diff.inWholeDays / 30}${monthShort().lowercase()}"
-            }
+            diff > 7.days -> "${diff.inWholeDays / 7}${weekShort().lowercase()}"
-
+            diff > 1.days -> "${diff.inWholeDays}${dayShort().lowercase()}"
-            now.month != then.month -> {
+            diff > 1.hours -> "${diff.inWholeHours}h"
-                "${now.month - then.month}${resources.getString(R.string.month_short).lowercase()}"
+            diff > 1.minutes -> "${diff.inWholeMinutes}${minuteShort().lowercase()}"
-            }
+            diff > 1.seconds -> "${diff.inWholeSeconds}${secondShort().lowercase()}"
-
+            else -> now().lowercase()
-            now.dayOfMonth != then.dayOfMonth -> {
-                val change = now.dayOfMonth - then.dayOfMonth
-
-                if (change % 7 == 0) {
-                    "${change / 7}${resources.getString(R.string.week_short).lowercase()}"
-                } else {
-                    "$change${resources.getString(R.string.day_short).lowercase()}"
-                }
-            }
-
-            now.hour == then.hour && now.minute == then.minute -> {
-                resources.getString(R.string.time_now).lowercase()
-            }
-
-            else -> {
-                SimpleDateFormat("HH:mm", Locale.getDefault()).format(date)
-            }
         }
     }
 }

core/common/src/main/kotlin/dev/meloda/fast/common/util/Utils.kt

@@ -0,0 +1,17 @@
+package dev.meloda.fast.common.util
+
+import java.net.URLEncoder
+import java.security.MessageDigest
+
+fun String.urlEncode(encoding: String = "utf-8"): String {
+    return URLEncoder.encode(this, encoding)
+}
+
+fun String.sha256() = this.hashString("SHA-256")
+
+fun String.hashString(algorithm: String): String {
+    return MessageDigest
+        .getInstance(algorithm)
+        .digest(this.toByteArray())
+        .fold("") { str, it -> str + "%02x".format(it) }
+}

core/common/src/main/res/values-ru/strings.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="yesterday">Вчера</string>
-    <string name="today">Сегодня</string>
-    <string name="year_short">Г</string>
-    <string name="month_short">М</string>
-    <string name="week_short">Н</string>
-    <string name="day_short">Д</string>
-    <string name="time_now">Сейчас</string>
-</resources>

core/common/src/main/res/values/strings.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="yesterday">Yesterday</string>
-    <string name="today">Today</string>
-    <string name="year_short">Y</string>
-    <string name="month_short">M</string>
-    <string name="week_short">W</string>
-    <string name="day_short">D</string>
-    <string name="time_now">Now</string>
-</resources>

core/data/build.gradle.kts

@@ -14,7 +14,6 @@ dependencies {
     api(projects.core.network)
     api(projects.core.database)
 
-    // TODO: 11/08/2024, Danil Nikolaev: remove?
     implementation(libs.retrofit)
     implementation(libs.eithernet)
     implementation(libs.koin.android)

core/data/src/main/kotlin/dev/meloda/fast/data/State.kt

@@ -25,8 +25,6 @@ sealed class State<out T> {
         data object InternalError : Error()
 
         data class OAuthError(val error: OAuthErrorDomain) : Error()
-
-        data class TestError(val message: String) : Error()
     }
 
     fun isLoading(): Boolean = this is Loading
@@ -38,16 +36,16 @@ sealed class State<out T> {
 }
 
 inline fun <T> State<T>.processState(
-    error: (error: State.Error) -> (Unit),
+    error: (error: State.Error) -> Unit,
-    success: (data: T) -> (Unit),
+    success: (data: T) -> Unit,
     idle: (() -> (Unit)) = {},
     loading: (() -> (Unit)) = {},
     any: () -> Unit = {}
 ) {
     when (this) {
         is State.Error -> {
-            error(this)
             any()
+            error(this)
         }
 
         State.Idle -> idle()
@@ -55,17 +53,47 @@ inline fun <T> State<T>.processState(
         State.Loading -> loading()
 
         is State.Success -> {
-            success(data)
             any()
+            success(data)
         }
     }
 }
 
+fun OAuthErrorDomain?.toStateApiError(): State.Error {
+    if (this == null) return State.Error.ConnectionError
+    return State.Error.OAuthError(this)
+}
+
 fun RestApiErrorDomain?.toStateApiError(): State.Error = when (this) {
     null -> State.Error.ConnectionError
     else -> State.Error.ApiError(VkErrorCode.parse(code), message)
 }
 
+fun <T : Any> ApiResult<T, OAuthErrorDomain>.asState() = when (this) {
+    is ApiResult.Success -> State.Success(this.value)
+
+    is ApiResult.Failure.NetworkFailure -> State.Error.ConnectionError
+    is ApiResult.Failure.UnknownFailure -> State.UNKNOWN_ERROR
+    is ApiResult.Failure.HttpFailure -> this.error.toStateApiError()
+    is ApiResult.Failure.ApiFailure -> this.error.toStateApiError()
+}
+
+fun <T : Any, N> ApiResult<T, OAuthErrorDomain>.asState(successMapper: (T) -> N) =
+    when (this) {
+        is ApiResult.Success -> State.Success(successMapper(this.value))
+
+        is ApiResult.Failure.NetworkFailure -> State.Error.ConnectionError
+        is ApiResult.Failure.UnknownFailure -> State.UNKNOWN_ERROR
+        is ApiResult.Failure.HttpFailure -> this.error.toStateApiError()
+        is ApiResult.Failure.ApiFailure -> this.error.toStateApiError()
+    }
+
+fun <T : Any, E : Any> ApiResult<T, E>.success(): T =
+    when (this) {
+        is ApiResult.Success -> value
+        else -> throw IllegalArgumentException()
+    }
+
 fun <T : Any> ApiResult<T, RestApiErrorDomain>.mapToState() = when (this) {
     is ApiResult.Success -> State.Success(this.value)
 

core/data/src/main/kotlin/dev/meloda/fast/data/UserConfig.kt

@@ -6,17 +6,18 @@ object UserConfig {
 
     private const val ARG_CURRENT_USER_ID = "current_user_id"
 
-    var currentUserId: Int = -1
+    var currentUserId: Long = -1
-        get() = AppSettings.getInt(ARG_CURRENT_USER_ID, -1)
+        get() = AppSettings.getLong(ARG_CURRENT_USER_ID, -1)
         set(value) {
             field = value
-            AppSettings.edit { putInt(ARG_CURRENT_USER_ID, value) }
+            AppSettings.edit { putLong(ARG_CURRENT_USER_ID, value) }
         }
 
-    var userId: Int = -1
+    var userId: Long = -1
     var accessToken: String = ""
     var fastToken: String? = ""
     var trustedHash: String? = null
+    var exchangeToken: String? = null
 
     fun clear() {
         currentUserId = -1

core/data/src/main/kotlin/dev/meloda/fast/data/VkGroupsMap.kt

@@ -1,7 +1,7 @@
 package dev.meloda.fast.data
 
 import dev.meloda.fast.model.api.data.VkMessageData
-import dev.meloda.fast.model.api.domain.VkConversation
+import dev.meloda.fast.model.api.domain.VkConvo
 import dev.meloda.fast.model.api.domain.VkGroupDomain
 import dev.meloda.fast.model.api.domain.VkMessage
 import kotlin.math.abs
@@ -10,15 +10,15 @@ class VkGroupsMap(
     private val groups: List<VkGroupDomain>
 ) {
 
-    private val map: HashMap<Int, VkGroupDomain> by lazy {
+    private val map: HashMap<Long, VkGroupDomain> by lazy {
         HashMap(groups.associateBy(VkGroupDomain::id))
     }
 
     fun groups(): List<VkGroupDomain> = map.values.toList()
 
-    fun conversationGroup(conversation: VkConversation): VkGroupDomain? =
+    fun convoGroup(convo: VkConvo): VkGroupDomain? =
-        if (!conversation.peerType.isGroup()) null
+        if (!convo.peerType.isGroup()) null
-        else map[abs(conversation.id)]
+        else map[abs(convo.id)]
 
     fun messageActionGroup(message: VkMessage): VkGroupDomain? =
         if (message.actionMemberId == null || message.actionMemberId!! >= 0) null
@@ -36,7 +36,7 @@ class VkGroupsMap(
         if (message.fromId >= 0) null
         else map[abs(message.fromId)]
 
-    fun group(groupId: Int): VkGroupDomain? = map[abs(groupId)]
+    fun group(groupId: Long): VkGroupDomain? = map[abs(groupId)]
 
     companion object {
 

core/data/src/main/kotlin/dev/meloda/fast/data/VkMemoryCache.kt

@@ -1,7 +1,8 @@
 package dev.meloda.fast.data
 
+import dev.meloda.fast.data.UserConfig.userId
 import dev.meloda.fast.model.api.domain.VkContactDomain
-import dev.meloda.fast.model.api.domain.VkConversation
+import dev.meloda.fast.model.api.domain.VkConvo
 import dev.meloda.fast.model.api.domain.VkGroupDomain
 import dev.meloda.fast.model.api.domain.VkMessage
 import dev.meloda.fast.model.api.domain.VkUser
@@ -9,11 +10,11 @@ import kotlin.math.abs
 
 object VkMemoryCache {
 
-    private val users: HashMap<Int, VkUser> = hashMapOf()
+    private val users: HashMap<Long, VkUser> = hashMapOf()
-    private val groups: HashMap<Int, VkGroupDomain> = hashMapOf()
+    private val groups: HashMap<Long, VkGroupDomain> = hashMapOf()
-    private val messages: HashMap<Int, VkMessage> = hashMapOf()
+    private val messages: HashMap<Long, VkMessage> = hashMapOf()
-    private val conversations: HashMap<Int, VkConversation> = hashMapOf()
+    private val convos: HashMap<Long, VkConvo> = hashMapOf()
-    private val contacts: HashMap<Int, VkContactDomain> = hashMapOf()
+    private val contacts: HashMap<Long, VkContactDomain> = hashMapOf()
 
     fun appendUsers(users: List<VkUser>) {
         users.forEach { user -> VkMemoryCache.users[user.id] = user }
@@ -27,9 +28,9 @@ object VkMemoryCache {
         messages.forEach { message -> VkMemoryCache.messages[message.id] = message }
     }
 
-    fun appendConversations(conversations: List<VkConversation>) {
+    fun appendConvos(convos: List<VkConvo>) {
-        conversations.forEach { conversation ->
+        convos.forEach { convo ->
-            VkMemoryCache.conversations[conversation.id] = conversation
+            VkMemoryCache.convos[convo.id] = convo
         }
     }
 
@@ -37,83 +38,83 @@ object VkMemoryCache {
         contacts.forEach { contact -> VkMemoryCache.contacts[contact.userId] = contact }
     }
 
-    operator fun set(userId: Int, user: VkUser) {
+    operator fun set(userid: Long, user: VkUser) {
         users[userId] = user
     }
 
-    operator fun set(groupId: Int, group: VkGroupDomain) {
+    operator fun set(groupId: Long, group: VkGroupDomain) {
         groups[groupId] = group
     }
 
-    operator fun set(messageId: Int, message: VkMessage) {
+    operator fun set(messageId: Long, message: VkMessage) {
         messages[messageId] = message
     }
 
-    operator fun set(conversationId: Int, conversation: VkConversation) {
+    operator fun set(convoId: Long, convo: VkConvo) {
-        conversations[conversationId] = conversation
+        convos[convoId] = convo
     }
 
-    operator fun set(contactId: Int, contact: VkContactDomain) {
+    operator fun set(contactId: Long, contact: VkContactDomain) {
         contacts[contactId] = contact
     }
 
-    fun getUser(id: Int): VkUser? {
+    fun getUser(id: Long): VkUser? {
         return getUsers(id).firstOrNull()
     }
 
-    fun getUsers(vararg ids: Int): List<VkUser> {
+    fun getUsers(vararg ids: Long): List<VkUser> {
         return getUsers(ids.toList())
     }
 
-    fun getUsers(ids: List<Int>): List<VkUser> {
+    fun getUsers(ids: List<Long>): List<VkUser> {
         return ids.mapNotNull { id -> users[id] }
     }
 
-    fun getGroup(id: Int): VkGroupDomain? {
+    fun getGroup(id: Long): VkGroupDomain? {
         return getGroups(id).firstOrNull()
     }
 
-    fun getGroups(vararg ids: Int): List<VkGroupDomain> {
+    fun getGroups(vararg ids: Long): List<VkGroupDomain> {
         return getGroups(ids.toList())
     }
 
-    fun getGroups(ids: List<Int>): List<VkGroupDomain> {
+    fun getGroups(ids: List<Long>): List<VkGroupDomain> {
         return ids.mapNotNull { id -> groups[id] }
     }
 
-    fun getMessage(id: Int): VkMessage? {
+    fun getMessage(id: Long): VkMessage? {
         return getMessages(id).firstOrNull()
     }
 
-    fun getMessages(vararg ids: Int): List<VkMessage> {
+    fun getMessages(vararg ids: Long): List<VkMessage> {
         return getMessages(ids.toList())
     }
 
-    fun getMessages(ids: List<Int>): List<VkMessage> {
+    fun getMessages(ids: List<Long>): List<VkMessage> {
         return ids.mapNotNull { id -> messages[id] }
     }
 
-    fun getConversation(id: Int): VkConversation? {
+    fun getConvo(id: Long): VkConvo? {
-        return getConversations(id).firstOrNull()
+        return getConvos(id).firstOrNull()
     }
 
-    fun getConversations(vararg ids: Int): List<VkConversation> {
+    fun getConvos(vararg ids: Long): List<VkConvo> {
-        return getConversations(ids.toList())
+        return getConvos(ids.toList())
     }
 
-    fun getConversations(ids: List<Int>): List<VkConversation> {
+    fun getConvos(ids: List<Long>): List<VkConvo> {
-        return ids.mapNotNull { id -> conversations[id] }
+        return ids.mapNotNull { id -> convos[id] }
     }
 
-    fun getContact(id: Int): VkContactDomain? {
+    fun getContact(id: Long): VkContactDomain? {
         return getContacts(id).firstOrNull()
     }
 
-    fun getContacts(vararg ids: Int): List<VkContactDomain> {
+    fun getContacts(vararg ids: Long): List<VkContactDomain> {
         return getContacts(ids.toList())
     }
 
-    fun getContacts(ids: List<Int>): List<VkContactDomain> {
+    fun getContacts(ids: List<Long>): List<VkContactDomain> {
         return ids.mapNotNull { id -> contacts[id] }
     }
 }

core/data/src/main/kotlin/dev/meloda/fast/data/VkUsersMap.kt

@@ -1,7 +1,7 @@
 package dev.meloda.fast.data
 
 import dev.meloda.fast.model.api.data.VkMessageData
-import dev.meloda.fast.model.api.domain.VkConversation
+import dev.meloda.fast.model.api.domain.VkConvo
 import dev.meloda.fast.model.api.domain.VkMessage
 import dev.meloda.fast.model.api.domain.VkUser
 
@@ -9,15 +9,15 @@ class VkUsersMap(
     private val users: List<VkUser>
 ) {
 
-    private val map: HashMap<Int, VkUser> by lazy {
+    private val map: HashMap<Long, VkUser> by lazy {
         HashMap(users.associateBy(VkUser::id))
     }
 
     fun users(): List<VkUser> = map.values.toList()
 
-    fun conversationUser(conversation: VkConversation): VkUser? =
+    fun convoUser(convo: VkConvo): VkUser? =
-        if (!conversation.peerType.isUser()) null
+        if (!convo.peerType.isUser()) null
-        else map[conversation.id]
+        else map[convo.id]
 
     fun messageActionUser(message: VkMessage): VkUser? =
         if (message.actionMemberId == null || message.actionMemberId!! <= 0) null
@@ -35,7 +35,7 @@ class VkUsersMap(
         if (message.fromId > 0) map[message.fromId]
         else null
 
-    fun user(userId: Int): VkUser? = map[userId]
+    fun user(userId: Long): VkUser? = map[userId]
 
     companion object {
 

core/data/src/main/kotlin/dev/meloda/fast/data/VkUtils.kt

@@ -0,0 +1,34 @@
+package dev.meloda.fast.data
+
+import dev.meloda.fast.model.BaseError
+import dev.meloda.fast.network.VkErrorCode
+
+object VkUtils {
+
+    fun parseError(error: State.Error): BaseError? {
+        return when (error) {
+            is State.Error.ApiError -> {
+                when (error.errorCode) {
+                    VkErrorCode.USER_AUTHORIZATION_FAILED -> {
+                        if (error.errorMessage.startsWith(
+                                "User authorization failed: user is blocked."
+                            )
+                        ) {
+                            BaseError.AccountBlocked
+                        } else {
+                            BaseError.SessionExpired
+                        }
+                    }
+
+                    else -> BaseError.SimpleError(message = error.errorMessage)
+                }
+            }
+
+            State.Error.ConnectionError -> BaseError.ConnectionError
+            State.Error.InternalError -> BaseError.InternalError
+            State.Error.UnknownError -> BaseError.UnknownError
+
+            else -> null
+        }
+    }
+}

core/data/src/main/kotlin/dev/meloda/fast/data/api/auth/AuthRepository.kt

@@ -1,12 +1,32 @@
 package dev.meloda.fast.data.api.auth
 
+import com.slack.eithernet.ApiResult
+import dev.meloda.fast.model.api.responses.ExchangeSilentTokenResponse
+import dev.meloda.fast.model.api.responses.GetAnonymTokenResponse
+import dev.meloda.fast.model.api.responses.GetExchangeTokenResponse
 import dev.meloda.fast.model.api.responses.ValidatePhoneResponse
 import dev.meloda.fast.network.RestApiErrorDomain
-import com.slack.eithernet.ApiResult
 
 interface AuthRepository {
 
+    suspend fun logout(): ApiResult<Int, RestApiErrorDomain>
+
     suspend fun validatePhone(
         validationSid: String
     ): ApiResult<ValidatePhoneResponse, RestApiErrorDomain>
+
+    suspend fun getAnonymToken(
+        clientId: String,
+        clientSecret: String
+    ): ApiResult<GetAnonymTokenResponse, RestApiErrorDomain>
+
+    suspend fun exchangeSilentToken(
+        anonymToken: String,
+        silentToken: String,
+        silentUuid: String
+    ): ApiResult<ExchangeSilentTokenResponse, RestApiErrorDomain>
+
+    suspend fun getExchangeToken(
+        accessToken: String
+    ): ApiResult<GetExchangeTokenResponse, RestApiErrorDomain>
 }

core/data/src/main/kotlin/dev/meloda/fast/data/api/auth/AuthRepositoryImpl.kt

@@ -1,10 +1,17 @@
 package dev.meloda.fast.data.api.auth
 
+import com.slack.eithernet.ApiResult
+import dev.meloda.fast.common.VkConstants
+import dev.meloda.fast.model.api.requests.ExchangeSilentTokenRequest
+import dev.meloda.fast.model.api.requests.GetAnonymTokenRequest
+import dev.meloda.fast.model.api.requests.GetExchangeTokenRequest
+import dev.meloda.fast.model.api.responses.ExchangeSilentTokenResponse
+import dev.meloda.fast.model.api.responses.GetAnonymTokenResponse
+import dev.meloda.fast.model.api.responses.GetExchangeTokenResponse
 import dev.meloda.fast.model.api.responses.ValidatePhoneResponse
 import dev.meloda.fast.network.RestApiErrorDomain
 import dev.meloda.fast.network.mapApiDefault
 import dev.meloda.fast.network.service.auth.AuthService
-import com.slack.eithernet.ApiResult
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
@@ -12,9 +19,50 @@ class AuthRepositoryImpl(
     private val service: AuthService
 ) : AuthRepository {
 
+    override suspend fun logout(): ApiResult<Int, RestApiErrorDomain> =
+        withContext(Dispatchers.IO) {
+            service.logout(
+                clientId = VkConstants.MESSENGER_APP_ID.toString(),
+                clientSecret = VkConstants.MESSENGER_APP_SECRET
+            ).mapApiDefault()
+        }
+
     override suspend fun validatePhone(
         validationSid: String
     ): ApiResult<ValidatePhoneResponse, RestApiErrorDomain> = withContext(Dispatchers.IO) {
         service.validatePhone(validationSid).mapApiDefault()
     }
+
+    override suspend fun getAnonymToken(
+        clientId: String,
+        clientSecret: String
+    ): ApiResult<GetAnonymTokenResponse, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        val requestModel = GetAnonymTokenRequest(
+            clientId = clientId,
+            clientSecret = clientSecret
+        )
+
+        service.getAnonymToken(requestModel.map).mapApiDefault()
+    }
+
+    override suspend fun exchangeSilentToken(
+        anonymToken: String,
+        silentToken: String,
+        silentUuid: String
+    ): ApiResult<ExchangeSilentTokenResponse, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        val requestModel = ExchangeSilentTokenRequest(
+            anonymToken = anonymToken,
+            silentToken = silentToken,
+            silentUuid = silentUuid
+        )
+
+        service.exchangeSilentToken(requestModel.map).mapApiDefault()
+    }
+
+    override suspend fun getExchangeToken(
+        accessToken: String
+    ): ApiResult<GetExchangeTokenResponse, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        val requestModel = GetExchangeTokenRequest(accessToken = accessToken)
+        service.getExchangeToken(requestModel.map).mapApiDefault()
+    }
 }

core/data/src/main/kotlin/dev/meloda/fast/data/api/conversations/ConversationsRepository.kt

@@ -1,22 +0,0 @@
-package dev.meloda.fast.data.api.conversations
-
-import com.slack.eithernet.ApiResult
-import dev.meloda.fast.model.api.domain.VkConversation
-import dev.meloda.fast.network.RestApiErrorDomain
-
-interface ConversationsRepository {
-
-    suspend fun getConversations(
-        count: Int?,
-        offset: Int?
-    ): ApiResult<List<VkConversation>, RestApiErrorDomain>
-
-    suspend fun getConversationsById(
-        peerIds: List<Int>
-    ): ApiResult<List<VkConversation>, RestApiErrorDomain>
-
-    suspend fun storeConversations(conversations: List<VkConversation>)
-    suspend fun delete(peerId: Int): ApiResult<Int, RestApiErrorDomain>
-    suspend fun pin(peerId: Int): ApiResult<Int, RestApiErrorDomain>
-    suspend fun unpin(peerId: Int): ApiResult<Int, RestApiErrorDomain>
-}

core/data/src/main/kotlin/dev/meloda/fast/data/api/conversations/ConversationsRepositoryImpl.kt

@@ -1,148 +0,0 @@
-package dev.meloda.fast.data.api.conversations
-
-import com.slack.eithernet.ApiResult
-import dev.meloda.fast.common.VkConstants
-import dev.meloda.fast.data.VkGroupsMap
-import dev.meloda.fast.data.VkMemoryCache
-import dev.meloda.fast.data.VkUsersMap
-import dev.meloda.fast.database.dao.ConversationDao
-import dev.meloda.fast.model.api.data.VkContactData
-import dev.meloda.fast.model.api.data.VkGroupData
-import dev.meloda.fast.model.api.data.VkUserData
-import dev.meloda.fast.model.api.data.asDomain
-import dev.meloda.fast.model.api.domain.VkConversation
-import dev.meloda.fast.model.api.domain.asEntity
-import dev.meloda.fast.model.api.requests.ConversationsDeleteRequest
-import dev.meloda.fast.model.api.requests.ConversationsGetRequest
-import dev.meloda.fast.model.api.requests.ConversationsPinRequest
-import dev.meloda.fast.model.api.requests.ConversationsUnpinRequest
-import dev.meloda.fast.network.RestApiErrorDomain
-import dev.meloda.fast.network.mapApiDefault
-import dev.meloda.fast.network.mapApiResult
-import dev.meloda.fast.network.service.conversations.ConversationsService
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-class ConversationsRepositoryImpl(
-    private val conversationsService: ConversationsService,
-    private val conversationDao: ConversationDao
-) : ConversationsRepository {
-
-    override suspend fun getConversations(
-        count: Int?,
-        offset: Int?
-    ): ApiResult<List<VkConversation>, RestApiErrorDomain> = withContext(Dispatchers.IO) {
-        val requestModel = ConversationsGetRequest(
-            count = count,
-            offset = offset,
-            fields = VkConstants.ALL_FIELDS,
-            filter = "all",
-            extended = true,
-            startMessageId = null
-        )
-
-        conversationsService.getConversations(requestModel.map).mapApiResult(
-            successMapper = { apiResponse ->
-                val response = apiResponse.requireResponse()
-
-                val profilesList = response.profiles.orEmpty().map(VkUserData::mapToDomain)
-                val groupsList = response.groups.orEmpty().map(VkGroupData::mapToDomain)
-                val contactsList = response.contacts.orEmpty().map(VkContactData::mapToDomain)
-
-                val usersMap = VkUsersMap.forUsers(profilesList)
-                val groupsMap = VkGroupsMap.forGroups(groupsList)
-
-                VkMemoryCache.appendUsers(profilesList)
-                VkMemoryCache.appendGroups(groupsList)
-                VkMemoryCache.appendContacts(contactsList)
-
-                response.items.map { item ->
-                    val lastMessage = item.lastMessage?.asDomain()?.let { message ->
-                        message.copy(
-                            user = usersMap.messageUser(message),
-                            group = groupsMap.messageGroup(message),
-                            actionUser = usersMap.messageActionUser(message),
-                            actionGroup = groupsMap.messageActionGroup(message)
-                        ).also { VkMemoryCache[message.id] = it }
-                    }
-                    item.conversation.asDomain(lastMessage).let { conversation ->
-                        conversation.copy(
-                            user = usersMap.conversationUser(conversation),
-                            group = groupsMap.conversationGroup(conversation)
-                        ).also { VkMemoryCache[conversation.id] = it }
-                    }
-                }
-            },
-            errorMapper = { error ->
-                error?.toDomain()
-            }
-        )
-    }
-
-    override suspend fun getConversationsById(
-        peerIds: List<Int>
-    ): ApiResult<List<VkConversation>, RestApiErrorDomain> = withContext(Dispatchers.IO) {
-        val requestParams = mapOf(
-            "peer_ids" to peerIds.joinToString(separator = ","),
-            "extended" to "1",
-            "fields" to VkConstants.ALL_FIELDS
-        )
-
-        conversationsService.getConversationsById(requestParams).mapApiResult(
-            successMapper = { apiResponse ->
-                val response = apiResponse.requireResponse()
-
-                val profilesList = response.profiles.orEmpty().map(VkUserData::mapToDomain)
-                val groupsList = response.groups.orEmpty().map(VkGroupData::mapToDomain)
-                val contactsList = response.contacts.orEmpty().map(VkContactData::mapToDomain)
-
-                val usersMap = VkUsersMap.forUsers(profilesList)
-                val groupsMap = VkGroupsMap.forGroups(groupsList)
-
-                VkMemoryCache.appendUsers(profilesList)
-                VkMemoryCache.appendGroups(groupsList)
-                VkMemoryCache.appendContacts(contactsList)
-
-                response.items.map { item ->
-                    item.asDomain().let { conversation ->
-                        conversation.copy(
-                            user = usersMap.conversationUser(conversation),
-                            group = groupsMap.conversationGroup(conversation)
-                        ).also { VkMemoryCache[conversation.id] = it }
-                    }
-                }
-            },
-            errorMapper = { error ->
-                error?.toDomain()
-            }
-        )
-    }
-
-    override suspend fun storeConversations(conversations: List<VkConversation>) {
-        conversationDao.insertAll(conversations.map(VkConversation::asEntity))
-    }
-
-    override suspend fun delete(peerId: Int): ApiResult<Int, RestApiErrorDomain> =
-        withContext(Dispatchers.IO) {
-            val requestModel = ConversationsDeleteRequest(peerId = peerId)
-
-            conversationsService.delete(requestModel.map).mapApiResult(
-                successMapper = { response -> response.requireResponse().lastDeletedId },
-                errorMapper = { error -> error?.toDomain() }
-            )
-        }
-
-    override suspend fun pin(
-        peerId: Int
-    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
-        val requestModel = ConversationsPinRequest(peerId = peerId)
-        conversationsService.pin(requestModel.map).mapApiDefault()
-    }
-
-    override suspend fun unpin(
-        peerId: Int
-    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
-        val requestModel = ConversationsUnpinRequest(peerId = peerId)
-        conversationsService.unpin(requestModel.map).mapApiDefault()
-    }
-}

core/data/src/main/kotlin/dev/meloda/fast/data/api/convos/ConvosRepository.kt

@@ -0,0 +1,30 @@
+package dev.meloda.fast.data.api.convos
+
+import com.slack.eithernet.ApiResult
+import dev.meloda.fast.model.ConvosFilter
+import dev.meloda.fast.model.api.domain.VkConvo
+import dev.meloda.fast.network.RestApiErrorDomain
+
+interface ConvosRepository {
+
+    suspend fun storeConvos(convos: List<VkConvo>)
+
+    suspend fun getConvos(
+        count: Int?,
+        offset: Int?,
+        filter: ConvosFilter
+    ): ApiResult<List<VkConvo>, RestApiErrorDomain>
+
+    suspend fun getConvosById(
+        peerIds: List<Long>,
+        extended: Boolean? = null,
+        fields: String? = null
+    ): ApiResult<List<VkConvo>, RestApiErrorDomain>
+
+    suspend fun delete(peerId: Long): ApiResult<Long, RestApiErrorDomain>
+    suspend fun pin(peerId: Long): ApiResult<Int, RestApiErrorDomain>
+    suspend fun unpin(peerId: Long): ApiResult<Int, RestApiErrorDomain>
+    suspend fun reorderPinned(peerIds: List<Long>): ApiResult<Int, RestApiErrorDomain>
+    suspend fun archive(peerId: Long): ApiResult<Int, RestApiErrorDomain>
+    suspend fun unarchive(peerId: Long): ApiResult<Int, RestApiErrorDomain>
+}

core/data/src/main/kotlin/dev/meloda/fast/data/api/convos/ConvosRepositoryImpl.kt

@@ -0,0 +1,201 @@
+package dev.meloda.fast.data.api.convos
+
+import com.slack.eithernet.ApiResult
+import dev.meloda.fast.common.VkConstants
+import dev.meloda.fast.data.VkGroupsMap
+import dev.meloda.fast.data.VkMemoryCache
+import dev.meloda.fast.data.VkUsersMap
+import dev.meloda.fast.database.dao.ConvoDao
+import dev.meloda.fast.database.dao.GroupDao
+import dev.meloda.fast.database.dao.MessageDao
+import dev.meloda.fast.database.dao.UserDao
+import dev.meloda.fast.model.ConvosFilter
+import dev.meloda.fast.model.api.data.VkContactData
+import dev.meloda.fast.model.api.data.VkGroupData
+import dev.meloda.fast.model.api.data.VkUserData
+import dev.meloda.fast.model.api.data.asDomain
+import dev.meloda.fast.model.api.domain.VkConvo
+import dev.meloda.fast.model.api.domain.VkGroupDomain
+import dev.meloda.fast.model.api.domain.VkMessage
+import dev.meloda.fast.model.api.domain.VkUser
+import dev.meloda.fast.model.api.domain.asEntity
+import dev.meloda.fast.model.api.requests.ConvosGetRequest
+import dev.meloda.fast.network.RestApiErrorDomain
+import dev.meloda.fast.network.mapApiDefault
+import dev.meloda.fast.network.mapApiResult
+import dev.meloda.fast.network.service.convos.ConvosService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class ConvosRepositoryImpl(
+    private val convosService: ConvosService,
+    private val messageDao: MessageDao,
+    private val userDao: UserDao,
+    private val groupDao: GroupDao,
+    private val convoDao: ConvoDao
+) : ConvosRepository {
+
+    override suspend fun storeConvos(convos: List<VkConvo>) {
+        convoDao.insertAll(convos.map(VkConvo::asEntity))
+    }
+
+    override suspend fun getConvos(
+        count: Int?,
+        offset: Int?,
+        filter: ConvosFilter
+    ): ApiResult<List<VkConvo>, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        val requestModel = ConvosGetRequest(
+            count = count,
+            offset = offset,
+            fields = VkConstants.ALL_FIELDS,
+            filter = filter,
+            extended = true,
+            startMessageId = null
+        )
+
+        convosService.getConvos(requestModel.map).mapApiResult(
+            successMapper = { apiResponse ->
+                val response = apiResponse.requireResponse()
+
+                val profilesList = response.profiles.orEmpty().map(VkUserData::mapToDomain)
+                val groupsList = response.groups.orEmpty().map(VkGroupData::mapToDomain)
+                val contactsList = response.contacts.orEmpty().map(VkContactData::mapToDomain)
+
+                val usersMap = VkUsersMap.forUsers(profilesList)
+                val groupsMap = VkGroupsMap.forGroups(groupsList)
+
+                VkMemoryCache.appendUsers(profilesList)
+                VkMemoryCache.appendGroups(groupsList)
+                VkMemoryCache.appendContacts(contactsList)
+
+                val convos = response.items.map { item ->
+                    val lastMessage = item.lastMessage?.asDomain()?.let { message ->
+                        message.copy(
+                            user = usersMap.messageUser(message),
+                            group = groupsMap.messageGroup(message),
+                            actionUser = usersMap.messageActionUser(message),
+                            actionGroup = groupsMap.messageActionGroup(message),
+                            replyMessage = message.replyMessage?.copy(
+                                user = usersMap.messageUser(message),
+                                group = groupsMap.messageGroup(message),
+                                actionUser = usersMap.messageActionUser(message),
+                                actionGroup = groupsMap.messageActionGroup(message),
+                            )
+                        ).also { VkMemoryCache[message.id] = it }
+                    }
+                    item.convo.asDomain(lastMessage).let { convo ->
+                        convo.copy(
+                            user = usersMap.convoUser(convo),
+                            group = groupsMap.convoGroup(convo)
+                        ).also { VkMemoryCache[convo.id] = it }
+                    }
+                }
+
+                val messages = convos.mapNotNull(VkConvo::lastMessage)
+
+                launch(Dispatchers.IO) {
+                    convoDao.insertAll(convos.map(VkConvo::asEntity))
+                    messageDao.insertAll(messages.map(VkMessage::asEntity))
+                    userDao.insertAll(profilesList.map(VkUser::asEntity))
+                    groupDao.insertAll(groupsList.map(VkGroupDomain::asEntity))
+                }
+
+                convos
+            },
+            errorMapper = { error ->
+                error?.toDomain()
+            }
+        )
+    }
+
+    override suspend fun getConvosById(
+        peerIds: List<Long>,
+        extended: Boolean?,
+        fields: String?
+    ): ApiResult<List<VkConvo>, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        val requestParams = mutableMapOf(
+            "peer_ids" to peerIds.joinToString(separator = ",")
+        ).apply {
+            extended?.let { this["extended"] = if (it) "1" else "0" }
+            fields?.let { this["fields"] = it }
+        }
+
+        convosService.getConvosById(requestParams).mapApiResult(
+            successMapper = { apiResponse ->
+                val response = apiResponse.requireResponse()
+
+                val profilesList = response.profiles.orEmpty().map(VkUserData::mapToDomain)
+                val groupsList = response.groups.orEmpty().map(VkGroupData::mapToDomain)
+                val contactsList = response.contacts.orEmpty().map(VkContactData::mapToDomain)
+
+                val usersMap = VkUsersMap.forUsers(profilesList)
+                val groupsMap = VkGroupsMap.forGroups(groupsList)
+
+                val convos = response.items.map { item ->
+                    item.asDomain().let { convo ->
+                        convo.copy(
+                            user = usersMap.convoUser(convo),
+                            group = groupsMap.convoGroup(convo)
+                        ).also { VkMemoryCache[convo.id] = it }
+                    }
+                }
+
+                launch(Dispatchers.IO) {
+                    convoDao.insertAll(convos.map(VkConvo::asEntity))
+                    userDao.insertAll(profilesList.map(VkUser::asEntity))
+                    groupDao.insertAll(groupsList.map(VkGroupDomain::asEntity))
+                }
+
+                VkMemoryCache.appendUsers(profilesList)
+                VkMemoryCache.appendGroups(groupsList)
+                VkMemoryCache.appendContacts(contactsList)
+
+                convos
+            },
+            errorMapper = { error ->
+                error?.toDomain()
+            }
+        )
+    }
+
+    override suspend fun delete(peerId: Long): ApiResult<Long, RestApiErrorDomain> =
+        withContext(Dispatchers.IO) {
+            convosService.delete(mapOf("peer_id" to peerId.toString())).mapApiResult(
+                successMapper = { response -> response.requireResponse().lastDeletedId },
+                errorMapper = { error -> error?.toDomain() }
+            )
+        }
+
+    override suspend fun pin(
+        peerId: Long
+    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        convosService.pin(mapOf("peer_id" to peerId.toString())).mapApiDefault()
+    }
+
+    override suspend fun unpin(
+        peerId: Long
+    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        convosService.unpin(mapOf("peer_id" to peerId.toString())).mapApiDefault()
+    }
+
+    override suspend fun reorderPinned(
+        peerIds: List<Long>
+    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        convosService
+            .reorderPinned(mapOf("peer_ids" to peerIds.joinToString(",")))
+            .mapApiDefault()
+    }
+
+    override suspend fun archive(
+        peerId: Long
+    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        convosService.archive(mapOf("peer_id" to peerId.toString())).mapApiDefault()
+    }
+
+    override suspend fun unarchive(
+        peerId: Long
+    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        convosService.unarchive(mapOf("peer_id" to peerId.toString())).mapApiDefault()
+    }
+}

core/data/src/main/kotlin/dev/meloda/fast/data/api/files/FilesRepository.kt

@@ -16,7 +16,7 @@ class FilesRepository(
 //        AUDIO_MESSAGE("audio_message")
 //    }
 //
-//    suspend fun getMessagesUploadServer(peerId: Int, type: FileType) =
+//    suspend fun getMessagesUploadServer(peerid: Long, type: FileType) =
 //        filesService.getUploadServer(
 //            mapOf(
 //                "peer_id" to peerId.toString(),

core/data/src/main/kotlin/dev/meloda/fast/data/api/friends/FriendsRepository.kt

@@ -8,11 +8,13 @@ import com.slack.eithernet.ApiResult
 interface FriendsRepository {
 
     suspend fun getAllFriends(
+        order: String,
         count: Int?,
         offset: Int?
     ): ApiResult<FriendsInfo, RestApiErrorDomain>
 
     suspend fun getFriends(
+        order: String,
         count: Int?,
         offset: Int?
     ): ApiResult<List<VkUser>, RestApiErrorDomain>
@@ -20,7 +22,7 @@ interface FriendsRepository {
     suspend fun getOnlineFriends(
         count: Int?,
         offset: Int?
-    ): ApiResult<List<Int>, RestApiErrorDomain>
+    ): ApiResult<List<Long>, RestApiErrorDomain>
 
     suspend fun storeUsers(users: List<VkUser>)
 }

core/data/src/main/kotlin/dev/meloda/fast/data/api/friends/FriendsRepositoryImpl.kt

@@ -2,7 +2,7 @@ package dev.meloda.fast.data.api.friends
 
 import dev.meloda.fast.common.VkConstants
 import dev.meloda.fast.data.VkMemoryCache
-import dev.meloda.fast.database.dao.UsersDao
+import dev.meloda.fast.database.dao.UserDao
 import dev.meloda.fast.model.FriendsInfo
 import dev.meloda.fast.model.api.data.VkUserData
 import dev.meloda.fast.model.api.domain.VkUser
@@ -21,14 +21,15 @@ import kotlinx.coroutines.withContext
 
 class FriendsRepositoryImpl(
     private val service: FriendsService,
-    private val dao: UsersDao
+    private val dao: UserDao
 ) : FriendsRepository {
 
     override suspend fun getAllFriends(
+        order: String,
         count: Int?,
         offset: Int?
     ): ApiResult<FriendsInfo, RestApiErrorDomain> = withContext(Dispatchers.IO) {
-        val friends = async { getFriends(count, offset) }.await()
+        val friends = async { getFriends(order, count, offset) }.await()
             .successOrElse { failure ->
                 return@withContext failure
             }
@@ -42,11 +43,12 @@ class FriendsRepositoryImpl(
     }
 
     override suspend fun getFriends(
+        order: String,
         count: Int?,
         offset: Int?
     ): ApiResult<List<VkUser>, RestApiErrorDomain> = withContext(Dispatchers.IO) {
         val requestModel = GetFriendsRequest(
-            order = "hints",
+            order = order,
             count = count,
             offset = offset,
             fields = VkConstants.USER_FIELDS
@@ -67,7 +69,7 @@ class FriendsRepositoryImpl(
     override suspend fun getOnlineFriends(
         count: Int?,
         offset: Int?
-    ): ApiResult<List<Int>, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+    ): ApiResult<List<Long>, RestApiErrorDomain> = withContext(Dispatchers.IO) {
         val requestModel = GetOnlineFriendsRequest(
             order = "hints",
             count = count,

core/data/src/main/kotlin/dev/meloda/fast/data/api/messages/MessagesHistoryInfo.kt

@@ -1,9 +1,9 @@
 package dev.meloda.fast.data.api.messages
 
-import dev.meloda.fast.model.api.domain.VkConversation
+import dev.meloda.fast.model.api.domain.VkConvo
 import dev.meloda.fast.model.api.domain.VkMessage
 
 data class MessagesHistoryInfo(
     val messages: List<VkMessage>,
-    val conversations: List<VkConversation>
+    val convos: List<VkConvo>
 )

core/data/src/main/kotlin/dev/meloda/fast/data/api/messages/MessagesRepository.kt

@@ -1,82 +1,119 @@
 package dev.meloda.fast.data.api.messages
 
 import com.slack.eithernet.ApiResult
+import dev.meloda.fast.model.api.data.VkChatData
 import dev.meloda.fast.model.api.domain.VkAttachment
 import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage
 import dev.meloda.fast.model.api.domain.VkMessage
+import dev.meloda.fast.model.api.responses.MessagesGetConvoMembersResponse
+import dev.meloda.fast.model.api.responses.MessagesGetReadPeersResponse
+import dev.meloda.fast.model.api.responses.MessagesSendResponse
 import dev.meloda.fast.network.RestApiErrorDomain
 
 interface MessagesRepository {
 
+    suspend fun storeMessages(messages: List<VkMessage>)
+
     suspend fun getHistory(
-        conversationId: Int,
+        convoId: Long,
         offset: Int?,
         count: Int?
     ): ApiResult<MessagesHistoryInfo, RestApiErrorDomain>
 
     suspend fun getById(
-        messagesIds: List<Int>,
+        peerCmIds: List<Long>?,
+        peerId: Long?,
+        messagesIds: List<Long>?,
+        cmIds: List<Long>?,
         extended: Boolean?,
         fields: String?
     ): ApiResult<List<VkMessage>, RestApiErrorDomain>
 
     suspend fun send(
-        peerId: Int,
+        peerId: Long,
-        randomId: Int,
+        randomId: Long,
         message: String?,
-        replyTo: Int?,
+        forward: String?,
-        attachments: List<VkAttachment>?
+        attachments: List<VkAttachment>?,
-    ): ApiResult<Int, RestApiErrorDomain>
+        formatData: VkMessage.FormatData?
+    ): ApiResult<MessagesSendResponse, RestApiErrorDomain>
 
     suspend fun markAsRead(
-        peerId: Int,
+        peerId: Long,
-        startMessageId: Int?
+        startMessageId: Long?
     ): ApiResult<Int, RestApiErrorDomain>
 
     suspend fun getHistoryAttachments(
-        peerId: Int,
+        peerId: Long,
         count: Int?,
         offset: Int?,
         attachmentTypes: List<String>,
-        conversationMessageId: Int
+        cmId: Long
     ): ApiResult<List<VkAttachmentHistoryMessage>, RestApiErrorDomain>
 
     suspend fun createChat(
-        userIds: List<Int>?,
+        userIds: List<Long>?,
         title: String?
+    ): ApiResult<Long, RestApiErrorDomain>
+
+    suspend fun pin(
+        peerId: Long,
+        messageId: Long? = null,
+        cmId: Long? = null
+    ): ApiResult<VkMessage, RestApiErrorDomain>
+
+    suspend fun unpin(
+        peerId: Long
     ): ApiResult<Int, RestApiErrorDomain>
 
-    suspend fun storeMessages(messages: List<VkMessage>)
+    suspend fun markAsImportant(
+        peerId: Long,
+        messageIds: List<Long>? = null,
+        cmIds: List<Long>? = null,
+        important: Boolean
+    ): ApiResult<List<Long>, RestApiErrorDomain>
 
-//    suspend fun markAsImportant(
+    suspend fun delete(
-//        params: MessagesMarkAsImportantRequest
+        peerId: Long,
-//    ): ApiResult<List<Int>, RestApiErrorDomain>
+        messageIds: List<Long>?,
-//
+        cmIds: List<Long>?,
-//    suspend fun pin(
+        spam: Boolean,
-//        params: MessagesPinMessageRequest
+        deleteForAll: Boolean
-//    ): ApiResult<VkMessageData, RestApiErrorDomain>
+    ): ApiResult<List<Any>, RestApiErrorDomain>
-//
+
-//    suspend fun unpin(
+    suspend fun edit(
-//        params: MessagesUnPinMessageRequest
+        peerId: Long,
-//    ): ApiResult<Unit, RestApiErrorDomain>
+        messageId: Long? = null,
-//
+        cmId: Long? = null,
-//    suspend fun delete(
+        message: String? = null,
-//        params: MessagesDeleteRequest
+        lat: Float? = null,
-//    ): ApiResult<Unit, RestApiErrorDomain>
+        long: Float? = null,
-//
+        attachments: List<VkAttachment>? = null,
-//    suspend fun edit(
+        notParseLinks: Boolean = false,
-//        params: MessagesEditRequest
+        keepSnippets: Boolean = true,
-//    ): ApiResult<Int, RestApiErrorDomain>
+        keepForwardedMessages: Boolean = true
-//
+    ): ApiResult<Int, RestApiErrorDomain>
-//    suspend fun getChat(
+
-//        params: MessagesGetChatRequest
+    suspend fun getChat(
-//    ): ApiResult<VkChatData, RestApiErrorDomain>
+        chatId: Long,
-//
+        fields: String? = null
-//    suspend fun getConversationMembers(
+    ): ApiResult<VkChatData, RestApiErrorDomain>
-//        params: MessagesGetConversationMembersRequest
+
-//    ): ApiResult<MessagesGetConversationMembersResponse, RestApiErrorDomain>
+    suspend fun getConvoMembers(
-//
+        peerId: Long,
-//    suspend fun removeChatUser(
+        offset: Int? = null,
-//        params: MessagesRemoveChatUserRequest
+        count: Int? = null,
-//    ): ApiResult<Int, RestApiErrorDomain>
+        extended: Boolean? = null,
+        fields: String? = null
+    ): ApiResult<MessagesGetConvoMembersResponse, RestApiErrorDomain>
+
+    suspend fun removeChatUser(
+        chatId: Long,
+        memberId: Long
+    ): ApiResult<Int, RestApiErrorDomain>
+
+    suspend fun getMessageReadPeers(
+        peerId: Long,
+        cmId: Long
+    ): ApiResult<MessagesGetReadPeersResponse, RestApiErrorDomain>
 }

core/data/src/main/kotlin/dev/meloda/fast/data/api/messages/MessagesRepositoryImpl.kt

@@ -5,43 +5,65 @@ import dev.meloda.fast.common.VkConstants
 import dev.meloda.fast.data.VkGroupsMap
 import dev.meloda.fast.data.VkMemoryCache
 import dev.meloda.fast.data.VkUsersMap
+import dev.meloda.fast.database.dao.ConvoDao
+import dev.meloda.fast.database.dao.GroupDao
 import dev.meloda.fast.database.dao.MessageDao
+import dev.meloda.fast.database.dao.UserDao
 import dev.meloda.fast.model.api.data.VkAttachmentHistoryMessageData
+import dev.meloda.fast.model.api.data.VkChatData
 import dev.meloda.fast.model.api.data.VkContactData
 import dev.meloda.fast.model.api.data.VkGroupData
 import dev.meloda.fast.model.api.data.VkUserData
 import dev.meloda.fast.model.api.data.asDomain
 import dev.meloda.fast.model.api.domain.VkAttachment
 import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage
+import dev.meloda.fast.model.api.domain.VkConvo
+import dev.meloda.fast.model.api.domain.VkGroupDomain
 import dev.meloda.fast.model.api.domain.VkMessage
+import dev.meloda.fast.model.api.domain.VkUser
 import dev.meloda.fast.model.api.domain.asEntity
 import dev.meloda.fast.model.api.requests.MessagesCreateChatRequest
+import dev.meloda.fast.model.api.requests.MessagesDeleteRequest
+import dev.meloda.fast.model.api.requests.MessagesEditRequest
 import dev.meloda.fast.model.api.requests.MessagesGetByIdRequest
+import dev.meloda.fast.model.api.requests.MessagesGetChatRequest
+import dev.meloda.fast.model.api.requests.MessagesGetConvoMembersRequest
 import dev.meloda.fast.model.api.requests.MessagesGetHistoryAttachmentsRequest
 import dev.meloda.fast.model.api.requests.MessagesGetHistoryRequest
+import dev.meloda.fast.model.api.requests.MessagesMarkAsImportantRequest
 import dev.meloda.fast.model.api.requests.MessagesMarkAsReadRequest
+import dev.meloda.fast.model.api.requests.MessagesPinMessageRequest
+import dev.meloda.fast.model.api.requests.MessagesRemoveChatUserRequest
 import dev.meloda.fast.model.api.requests.MessagesSendRequest
+import dev.meloda.fast.model.api.requests.MessagesUnpinMessageRequest
+import dev.meloda.fast.model.api.responses.MessagesGetConvoMembersResponse
+import dev.meloda.fast.model.api.responses.MessagesGetReadPeersResponse
+import dev.meloda.fast.model.api.responses.MessagesSendResponse
 import dev.meloda.fast.network.RestApiErrorDomain
 import dev.meloda.fast.network.mapApiDefault
 import dev.meloda.fast.network.mapApiResult
 import dev.meloda.fast.network.service.messages.MessagesService
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 class MessagesRepositoryImpl(
     private val messagesService: MessagesService,
     private val messageDao: MessageDao,
+    private val userDao: UserDao,
+    private val groupDao: GroupDao,
+    private val convoDao: ConvoDao
 ) : MessagesRepository {
 
     override suspend fun getHistory(
-        conversationId: Int,
+        convoId: Long,
         offset: Int?,
         count: Int?
     ): ApiResult<MessagesHistoryInfo, RestApiErrorDomain> = withContext(Dispatchers.IO) {
         val requestModel = MessagesGetHistoryRequest(
             count = count,
             offset = offset,
-            peerId = conversationId,
+            peerId = convoId,
             extended = true,
             startMessageId = null,
             rev = null,
@@ -69,25 +91,40 @@ class MessagesRepositoryImpl(
                             user = usersMap.messageUser(message),
                             group = groupsMap.messageGroup(message),
                             actionUser = usersMap.messageActionUser(message),
-                            actionGroup = groupsMap.messageActionGroup(message)
+                            actionGroup = groupsMap.messageActionGroup(message),
+                            replyMessage = message.replyMessage.let { replyMessage ->
+                                replyMessage?.copy(
+                                    user = usersMap.messageUser(replyMessage),
+                                    group = groupsMap.messageGroup(replyMessage),
+                                    actionUser = usersMap.messageActionUser(replyMessage),
+                                    actionGroup = groupsMap.messageActionGroup(replyMessage),
+                                )
+                            }
                         ).also { VkMemoryCache[message.id] = it }
                     }
                 }
 
-                val conversations = response.conversations.orEmpty().map { item ->
+                val convos = response.convos.orEmpty().map { item ->
                     val message = messages.firstOrNull { it.id == item.lastMessageId }
                     item.asDomain(message)
-                        .let { conversation ->
+                        .let { convo ->
-                            conversation.copy(
+                            convo.copy(
-                                user = usersMap.conversationUser(conversation),
+                                user = usersMap.convoUser(convo),
-                                group = groupsMap.conversationGroup(conversation)
+                                group = groupsMap.convoGroup(convo)
-                            ).also { VkMemoryCache[conversation.id] = it }
+                            ).also { VkMemoryCache[convo.id] = it }
                         }
                 }
 
+                launch(Dispatchers.IO) {
+                    convoDao.insertAll(convos.map(VkConvo::asEntity))
+                    messageDao.insertAll(messages.map(VkMessage::asEntity))
+                    userDao.insertAll(profilesList.map(VkUser::asEntity))
+                    groupDao.insertAll(groupsList.map(VkGroupDomain::asEntity))
+                }
+
                 MessagesHistoryInfo(
                     messages = messages,
-                    conversations = conversations
+                    convos = convos
                 )
             },
             errorMapper = { error ->
@@ -97,12 +134,18 @@ class MessagesRepositoryImpl(
     }
 
     override suspend fun getById(
-        messagesIds: List<Int>,
+        peerCmIds: List<Long>?,
+        peerId: Long?,
+        messagesIds: List<Long>?,
+        cmIds: List<Long>?,
         extended: Boolean?,
         fields: String?
     ): ApiResult<List<VkMessage>, RestApiErrorDomain> = withContext(Dispatchers.IO) {
         val requestModel = MessagesGetByIdRequest(
+            peerCmIds = peerCmIds,
+            peerId = peerId,
             messagesIds = messagesIds,
+            cmIds = cmIds,
             extended = extended,
             fields = fields
         )
@@ -112,45 +155,70 @@ class MessagesRepositoryImpl(
                 val response = apiResponse.requireResponse()
 
                 val messages = response.items
-                val usersMap =
-                    VkUsersMap.forUsers(response.profiles.orEmpty().map(VkUserData::mapToDomain))
-                val groupsMap =
-                    VkGroupsMap.forGroups(response.groups.orEmpty().map(VkGroupData::mapToDomain))
 
-                messages.map { message ->
+                val profilesList = response.profiles.orEmpty().map(VkUserData::mapToDomain)
+                val groupsList = response.groups.orEmpty().map(VkGroupData::mapToDomain)
+                val contactsList = response.contacts.orEmpty().map(VkContactData::mapToDomain)
+
+                val usersMap = VkUsersMap.forUsers(profilesList)
+                val groupsMap = VkGroupsMap.forGroups(groupsList)
+
+                val domainMessages = messages.map { message ->
                     message.asDomain().copy(
                         user = usersMap.messageUser(message),
                         group = groupsMap.messageGroup(message),
                         actionUser = usersMap.messageActionUser(message),
-                        actionGroup = groupsMap.messageActionGroup(message)
+                        actionGroup = groupsMap.messageActionGroup(message),
+                        replyMessage = message.replyMessage?.asDomain().let { replyMessage ->
+                            replyMessage?.copy(
+                                user = usersMap.messageUser(replyMessage),
+                                group = groupsMap.messageGroup(replyMessage),
+                                actionUser = usersMap.messageActionUser(replyMessage),
+                                actionGroup = groupsMap.messageActionGroup(replyMessage),
                             )
                         }
+                    )
+                }
+
+                launch(Dispatchers.IO) {
+                    messageDao.insertAll(domainMessages.map(VkMessage::asEntity))
+                    userDao.insertAll(profilesList.map(VkUser::asEntity))
+                    groupDao.insertAll(groupsList.map(VkGroupDomain::asEntity))
+                }
+
+                VkMemoryCache.appendUsers(profilesList)
+                VkMemoryCache.appendGroups(groupsList)
+                VkMemoryCache.appendContacts(contactsList)
+
+                domainMessages
             },
             errorMapper = { error -> error?.toDomain() }
         )
     }
 
     override suspend fun send(
-        peerId: Int,
+        peerId: Long,
-        randomId: Int,
+        randomId: Long,
         message: String?,
-        replyTo: Int?,
+        forward: String?,
-        attachments: List<VkAttachment>?
+        attachments: List<VkAttachment>?,
-    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        formatData: VkMessage.FormatData?
+    ): ApiResult<MessagesSendResponse, RestApiErrorDomain> = withContext(Dispatchers.IO) {
         val requestModel = MessagesSendRequest(
             peerId = peerId,
             randomId = randomId,
             message = message,
-            replyTo = replyTo,
+            forward = forward,
-            attachments = attachments
+            attachments = attachments,
+            formatData = formatData
         )
 
         messagesService.send(requestModel.map).mapApiDefault()
     }
 
     override suspend fun markAsRead(
-        peerId: Int,
+        peerId: Long,
-        startMessageId: Int?
+        startMessageId: Long?
     ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
         val requestModel = MessagesMarkAsReadRequest(
             peerId = peerId,
@@ -161,11 +229,11 @@ class MessagesRepositoryImpl(
     }
 
     override suspend fun getHistoryAttachments(
-        peerId: Int,
+        peerId: Long,
         count: Int?,
         offset: Int?,
         attachmentTypes: List<String>,
-        conversationMessageId: Int
+        cmId: Long
     ): ApiResult<List<VkAttachmentHistoryMessage>, RestApiErrorDomain> =
         withContext(Dispatchers.IO) {
             val requestModel = MessagesGetHistoryAttachmentsRequest(
@@ -175,7 +243,7 @@ class MessagesRepositoryImpl(
                 offset = offset,
                 preserveOrder = true,
                 attachmentTypes = attachmentTypes,
-                conversationMessageId = conversationMessageId,
+                cmId = cmId,
                 fields = VkConstants.ALL_FIELDS
             )
 
@@ -191,6 +259,11 @@ class MessagesRepositoryImpl(
                     VkMemoryCache.appendGroups(groupsList)
                     VkMemoryCache.appendContacts(contactsList)
 
+                    launch(Dispatchers.IO) {
+                        userDao.insertAll(profilesList.map(VkUser::asEntity))
+                        groupDao.insertAll(groupsList.map(VkGroupDomain::asEntity))
+                    }
+
                     response.items.map(VkAttachmentHistoryMessageData::toDomain)
                 },
                 errorMapper = { error ->
@@ -200,9 +273,9 @@ class MessagesRepositoryImpl(
         }
 
     override suspend fun createChat(
-        userIds: List<Int>?,
+        userIds: List<Long>?,
         title: String?
-    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+    ): ApiResult<Long, RestApiErrorDomain> = withContext(Dispatchers.IO) {
         val requestModel = MessagesCreateChatRequest(
             userIds = userIds,
             title = title
@@ -216,81 +289,153 @@ class MessagesRepositoryImpl(
         )
     }
 
+    override suspend fun pin(
+        peerId: Long,
+        messageId: Long?,
+        cmId: Long?
+    ): ApiResult<VkMessage, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        val requestModel = MessagesPinMessageRequest(
+            peerId = peerId,
+            messageId = messageId,
+            cmId = cmId
+        )
+
+        messagesService.pin(requestModel.map).mapApiResult(
+            successMapper = { apiResponse ->
+                apiResponse.requireResponse().asDomain()
+            },
+            errorMapper = { error -> error?.toDomain() }
+        )
+    }
+
+    override suspend fun unpin(
+        peerId: Long
+    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        val requestModel = MessagesUnpinMessageRequest(peerId = peerId)
+        messagesService.unpin(requestModel.map).mapApiDefault()
+    }
+
+    override suspend fun markAsImportant(
+        peerId: Long,
+        messageIds: List<Long>?,
+        cmIds: List<Long>?,
+        important: Boolean
+    ): ApiResult<List<Long>, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        val requestModel = MessagesMarkAsImportantRequest(
+            messagesIds = messageIds.orEmpty(),
+            important = important
+        )
+        messagesService.markAsImportant(requestModel.map).mapApiResult(
+            successMapper = { apiResponse ->
+                apiResponse.requireResponse().marked.map { it.cmId }
+            },
+            errorMapper = { error -> error?.toDomain() }
+        )
+    }
+
+    override suspend fun delete(
+        peerId: Long,
+        messageIds: List<Long>?,
+        cmIds: List<Long>?,
+        spam: Boolean,
+        deleteForAll: Boolean
+    ): ApiResult<List<Any>, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        val requestModel = MessagesDeleteRequest(
+            peerId = peerId,
+            messagesIds = messageIds,
+            cmIds = cmIds,
+            isSpam = spam,
+            deleteForAll = deleteForAll
+        )
+        messagesService.delete(requestModel.map).mapApiDefault()
+    }
+
     override suspend fun storeMessages(messages: List<VkMessage>) {
         messageDao.insertAll(messages.map(VkMessage::asEntity))
     }
 
-//    override suspend fun markAsImportant(
+    override suspend fun edit(
-//        params: MessagesMarkAsImportantRequest
+        peerId: Long,
-//    ): ApiResult<List<Int>, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        messageId: Long?,
-//        messagesService.markAsImportant(params.map).mapResult(
+        cmId: Long?,
-//            successMapper = { response -> response.requireResponse() },
+        message: String?,
-//            errorMapper = { error -> error?.toDomain() }
+        lat: Float?,
-//        )
+        long: Float?,
-//    }
+        attachments: List<VkAttachment>?,
-//
+        notParseLinks: Boolean,
-//    override suspend fun pin(
+        keepSnippets: Boolean,
-//        params: MessagesPinMessageRequest
+        keepForwardedMessages: Boolean
-//    ): ApiResult<VkMessageData, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
-//        messagesService.pin(params.map).mapResult(
+        val requestModel = MessagesEditRequest(
-//            successMapper = { response -> response.requireResponse() },
+            peerId = peerId,
-//            errorMapper = { error -> error?.toDomain() }
+            messageId = messageId,
-//        )
+            cmId = cmId,
-//    }
+            message = message,
-//
+            lat = lat,
-//    override suspend fun unpin(
+            long = long,
-//        params: MessagesUnPinMessageRequest
+            attachments = attachments,
-//    ): ApiResult<Unit, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+            notParseLinks = notParseLinks,
-//        messagesService.unpin(params.map).mapResult(
+            keepSnippets = keepSnippets,
-//            successMapper = {},
+            keepForwardedMessages = keepForwardedMessages
-//            errorMapper = { error -> error?.toDomain() }
+        )
-//        )
-//    }
-//
-//    override suspend fun delete(
-//        params: MessagesDeleteRequest
-//    ): ApiResult<Unit, RestApiErrorDomain> = withContext(Dispatchers.IO) {
-//        messagesService.delete(params.map).mapResult(
-//            successMapper = {},
-//            errorMapper = { error -> error?.toDomain() }
-//        )
-//    }
-//
-//    override suspend fun edit(
-//        params: MessagesEditRequest
-//    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
-//        messagesService.edit(params.map).mapResult(
-//            successMapper = { response -> response.requireResponse() },
-//            errorMapper = { error -> error?.toDomain() }
-//        )
-//    }
-//
-//    override suspend fun getChat(
-//        params: MessagesGetChatRequest
-//    ): ApiResult<VkChatData, RestApiErrorDomain> = withContext(Dispatchers.IO) {
-//        messagesService.getChat(params.map).mapResult(
-//            successMapper = { response -> response.requireResponse() },
-//            errorMapper = { error -> error?.toDomain() }
-//        )
-//    }
-//
-//    override suspend fun getConversationMembers(
-//        params: MessagesGetConversationMembersRequest
-//    ): ApiResult<MessagesGetConversationMembersResponse, RestApiErrorDomain> =
-//        withContext(Dispatchers.IO) {
-//            messagesService.getConversationMembers(params.map).mapResult(
-//                successMapper = { response -> response.requireResponse() },
-//                errorMapper = { error -> error?.toDomain() }
-//            )
-//        }
-//
-//    override suspend fun removeChatUser(
-//        params: MessagesRemoveChatUserRequest
-//    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
-//        messagesService.removeChatUser(params.map).mapResult(
-//            successMapper = { response -> response.requireResponse() },
-//            errorMapper = { error -> error?.toDomain() }
-//        )
-//    }
-}
 
+        messagesService.edit(requestModel.map).mapApiDefault()
+    }
+
+    override suspend fun getChat(
+        chatId: Long,
+        fields: String?
+    ): ApiResult<VkChatData, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        val requestModel = MessagesGetChatRequest(
+            chatId = chatId,
+            fields = fields
+        )
+
+        messagesService.getChat(requestModel.map).mapApiDefault()
+    }
+
+    override suspend fun getConvoMembers(
+        peerId: Long,
+        offset: Int?,
+        count: Int?,
+        extended: Boolean?,
+        fields: String?
+    ): ApiResult<MessagesGetConvoMembersResponse, RestApiErrorDomain> =
+        withContext(Dispatchers.IO) {
+            val requestModel = MessagesGetConvoMembersRequest(
+                peerId = peerId,
+                offset = offset,
+                count = count,
+                extended = extended,
+                fields = fields
+            )
+
+            messagesService.getConvoMembers(requestModel.map).mapApiDefault()
+        }
+
+    override suspend fun removeChatUser(
+        chatId: Long,
+        memberId: Long
+    ): ApiResult<Int, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        val requestModel = MessagesRemoveChatUserRequest(
+            chatId = chatId,
+            memberId = memberId
+        )
+
+        messagesService.removeChatUser(requestModel.map).mapApiDefault()
+    }
+
+    override suspend fun getMessageReadPeers(
+        peerId: Long,
+        cmId: Long
+    ): ApiResult<MessagesGetReadPeersResponse, RestApiErrorDomain> = withContext(Dispatchers.IO) {
+        messagesService.getMessageReadPeers(
+            mapOf(
+                "peer_id" to peerId.toString(),
+                "cmid" to cmId.toString(),
+                "extended" to "1",
+                "fields" to VkConstants.USER_FIELDS
+            )
+        ).mapApiDefault()
+    }
+}

core/data/src/main/kotlin/dev/meloda/fast/data/api/oauth/OAuthRepository.kt

@@ -1,6 +1,9 @@
 package dev.meloda.fast.data.api.oauth
 
+import com.slack.eithernet.ApiResult
 import dev.meloda.fast.model.api.responses.AuthDirectResponse
+import dev.meloda.fast.model.api.responses.GetSilentTokenResponse
+import dev.meloda.fast.network.OAuthErrorDomain
 
 interface OAuthRepository {
 
@@ -11,5 +14,15 @@ interface OAuthRepository {
         validationCode: String?,
         captchaSid: String?,
         captchaKey: String?
-    ): AuthDirectResponse
+    ): ApiResult<AuthDirectResponse, OAuthErrorDomain>
+
+    suspend fun getSilentToken(
+        login: String,
+        password: String,
+        forceSms: Boolean,
+        validationCode: String?,
+        captchaSid: String?,
+        captchaKey: String?,
+        successToken: String?
+    ): ApiResult<GetSilentTokenResponse, OAuthErrorDomain>
 }

core/data/src/main/kotlin/dev/meloda/fast/data/api/oauth/OAuthRepositoryImpl.kt

@@ -1,10 +1,16 @@
 package dev.meloda.fast.data.api.oauth
 
+import com.slack.eithernet.ApiResult
 import dev.meloda.fast.common.VkConstants
 import dev.meloda.fast.model.api.requests.AuthDirectRequest
 import dev.meloda.fast.model.api.responses.AuthDirectResponse
+import dev.meloda.fast.model.api.responses.GetSilentTokenResponse
+import dev.meloda.fast.network.OAuthErrorDomain
+import dev.meloda.fast.network.ValidationType
+import dev.meloda.fast.network.VkOAuthError
+import dev.meloda.fast.network.VkOAuthErrorType
+import dev.meloda.fast.network.mapResult
 import dev.meloda.fast.network.service.oauth.OAuthService
-import com.slack.eithernet.ApiResult
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
@@ -18,37 +24,194 @@ class OAuthRepositoryImpl(
         forceSms: Boolean,
         validationCode: String?,
         captchaSid: String?,
-        captchaKey: String?
+        captchaKey: String?,
-    ): AuthDirectResponse = withContext(Dispatchers.IO) {
+    ): ApiResult<AuthDirectResponse, OAuthErrorDomain> = withContext(Dispatchers.IO) {
         val requestModel = AuthDirectRequest(
             grantType = VkConstants.Auth.GrantType.PASSWORD,
-            clientId = VkConstants.VK_APP_ID,
+            clientId = VkConstants.MESSENGER_APP_ID.toString(),
-            clientSecret = VkConstants.VK_SECRET,
+            clientSecret = VkConstants.MESSENGER_APP_SECRET,
             username = login,
             password = password,
-            scope = VkConstants.Auth.SCOPE,
+            scope = VkConstants.MESSENGER_APP_SCOPE.toString(),
             validationForceSms = forceSms,
             validationCode = validationCode,
             captchaSid = captchaSid,
             captchaKey = captchaKey,
         )
 
-        when (val result = oAuthService.auth(requestModel.map)) {
+        oAuthService.auth(requestModel.map).mapResult(
-            is ApiResult.Success -> result.value
+            successMapper = {
+                it
+            },
+            errorMapper = { response ->
+                val error = response?.error?.let(VkOAuthError::parse)
+                val errorType = response?.errorType?.let(VkOAuthErrorType::parse)
 
-            is ApiResult.Failure.HttpFailure -> {
+                when (error) {
-                requireNotNull(result.error)
+                    null -> OAuthErrorDomain.UnknownError
+
+                    VkOAuthError.FLOOD_CONTROL -> OAuthErrorDomain.TooManyTriesError
+
+                    VkOAuthError.NEED_VALIDATION -> {
+                        if (response.banInfo != null) {
+                            val info = requireNotNull(response.banInfo)
+
+                            OAuthErrorDomain.UserBannedError(
+                                memberName = info.memberName,
+                                message = info.message,
+                                accessToken = info.accessToken,
+                                restoreUrl = info.restoreUrl
+                            )
+                        } else {
+                            OAuthErrorDomain.ValidationRequiredError(
+                                description = response.errorDescription.orEmpty(),
+                                validationType = response.validationType.orEmpty()
+                                    .let(ValidationType::parse),
+                                validationSid = response.validationSid.orEmpty(),
+                                phoneMask = response.phoneMask.orEmpty(),
+                                redirectUri = response.redirectUri.orEmpty(),
+                                validationResend = response.validationResend,
+                                restoreIfCannotGetCode = response.restoreIfCannotGetCode
+                            )
+                        }
                     }
 
-            is ApiResult.Failure.ApiFailure -> TODO()
+                    VkOAuthError.NEED_CAPTCHA -> {
-
+                        OAuthErrorDomain.CaptchaRequiredError(
-            is ApiResult.Failure.NetworkFailure -> {
+                            captchaSid = response.captchaSid.orEmpty(),
-                // TODO: 13/07/2024, Danil Nikolaev: implement showing network error
+                            captchaImageUrl = response.captchaImage.orEmpty(),
-                TODO()
+                            redirectUri = response.redirectUri
+                        )
                     }
-            is ApiResult.Failure.UnknownFailure -> TODO()
 
-            else -> throw IllegalStateException("Unknown result")
+                    VkOAuthError.INVALID_CLIENT -> {
+                        OAuthErrorDomain.InvalidCredentialsError
                     }
+
+                    VkOAuthError.INVALID_REQUEST -> {
+                        when (errorType) {
+                            null -> OAuthErrorDomain.UnknownError
+
+                            VkOAuthErrorType.WRONG_OTP -> {
+                                OAuthErrorDomain.WrongValidationCode
+                            }
+
+                            VkOAuthErrorType.WRONG_OTP_FORMAT -> {
+                                OAuthErrorDomain.WrongValidationCodeFormat
+                            }
+
+                            VkOAuthErrorType.PASSWORD_BRUTEFORCE_ATTEMPT -> {
+                                OAuthErrorDomain.TooManyTriesError
+                            }
+
+                            VkOAuthErrorType.USERNAME_OR_PASSWORD_IS_INCORRECT -> {
+                                OAuthErrorDomain.InvalidCredentialsError
+                            }
+                        }
+                    }
+
+                    VkOAuthError.UNKNOWN -> OAuthErrorDomain.UnknownError
+                }
+            }
+        )
+    }
+
+    override suspend fun getSilentToken(
+        login: String,
+        password: String,
+        forceSms: Boolean,
+        validationCode: String?,
+        captchaSid: String?,
+        captchaKey: String?,
+        successToken: String?
+    ): ApiResult<GetSilentTokenResponse, OAuthErrorDomain> =
+        withContext(Dispatchers.IO) {
+            val requestModel = AuthDirectRequest(
+                grantType = VkConstants.Auth.GrantType.PASSWORD,
+                clientId = VkConstants.MESSENGER_APP_ID.toString(),
+                clientSecret = VkConstants.MESSENGER_APP_SECRET,
+                username = login,
+                password = password,
+                scope = VkConstants.MESSENGER_APP_SCOPE.toString(),
+                validationForceSms = forceSms,
+                validationCode = validationCode,
+                captchaSid = captchaSid,
+                captchaKey = captchaKey,
+                successToken = successToken
+            )
+
+            oAuthService.getSilentToken(requestModel.map).mapResult(
+                successMapper = { it },
+                errorMapper = { response ->
+                    val error = response?.error?.let(VkOAuthError::parse)
+                    val errorType = response?.errorType?.let(VkOAuthErrorType::parse)
+
+                    when (error) {
+                        null -> OAuthErrorDomain.UnknownError
+
+                        VkOAuthError.FLOOD_CONTROL -> OAuthErrorDomain.TooManyTriesError
+
+                        VkOAuthError.NEED_VALIDATION -> {
+                            if (response.banInfo != null) {
+                                val info = requireNotNull(response.banInfo)
+
+                                OAuthErrorDomain.UserBannedError(
+                                    memberName = info.memberName,
+                                    message = info.message,
+                                    accessToken = info.accessToken,
+                                    restoreUrl = info.restoreUrl
+                                )
+                            } else {
+                                OAuthErrorDomain.ValidationRequiredError(
+                                    description = response.errorDescription.orEmpty(),
+                                    validationType = response.validationType.orEmpty()
+                                        .let(ValidationType::parse),
+                                    validationSid = response.validationSid.orEmpty(),
+                                    phoneMask = response.phoneMask.orEmpty(),
+                                    redirectUri = response.redirectUri.orEmpty(),
+                                    validationResend = response.validationResend,
+                                    restoreIfCannotGetCode = response.restoreIfCannotGetCode
+                                )
+                            }
+                        }
+
+                        VkOAuthError.NEED_CAPTCHA -> {
+                            OAuthErrorDomain.CaptchaRequiredError(
+                                captchaSid = response.captchaSid.orEmpty(),
+                                captchaImageUrl = response.captchaImage.orEmpty(),
+                                redirectUri = response.redirectUri
+                            )
+                        }
+
+                        VkOAuthError.INVALID_CLIENT -> {
+                            OAuthErrorDomain.InvalidCredentialsError
+                        }
+
+                        VkOAuthError.INVALID_REQUEST -> {
+                            when (errorType) {
+                                null -> OAuthErrorDomain.UnknownError
+
+                                VkOAuthErrorType.WRONG_OTP -> {
+                                    OAuthErrorDomain.WrongValidationCode
+                                }
+
+                                VkOAuthErrorType.WRONG_OTP_FORMAT -> {
+                                    OAuthErrorDomain.WrongValidationCodeFormat
+                                }
+
+                                VkOAuthErrorType.PASSWORD_BRUTEFORCE_ATTEMPT -> {
+                                    OAuthErrorDomain.TooManyTriesError
+                                }
+
+                                VkOAuthErrorType.USERNAME_OR_PASSWORD_IS_INCORRECT -> {
+                                    OAuthErrorDomain.InvalidCredentialsError
+                                }
+                            }
+                        }
+
+                        VkOAuthError.UNKNOWN -> OAuthErrorDomain.UnknownError
+                    }
+                }
+            )
         }
 }

core/data/src/main/kotlin/dev/meloda/fast/data/api/photos/PhotosRepository.kt

@@ -8,7 +8,7 @@ class PhotosRepository(
     private val photosService: PhotosService
 ) {
 
-    suspend fun getMessagesUploadServer(peerId: Int) =
+    suspend fun getMessagesUploadServer(peerId: Long) =
         photosService.getUploadServer(mapOf("peer_id" to peerId.toString()))
 
     suspend fun uploadPhoto(url: String, photo: MultipartBody.Part) =

core/data/src/main/kotlin/dev/meloda/fast/data/api/users/UsersRepository.kt

@@ -1,18 +1,18 @@
 package dev.meloda.fast.data.api.users
 
+import com.slack.eithernet.ApiResult
 import dev.meloda.fast.model.api.domain.VkUser
 import dev.meloda.fast.network.RestApiErrorDomain
-import com.slack.eithernet.ApiResult
 
 interface UsersRepository {
 
     suspend fun get(
-        userIds: List<Int>?,
+        userIds: List<Long>?,
         fields: String?,
         nomCase: String?
     ): ApiResult<List<VkUser>, RestApiErrorDomain>
 
-    suspend fun getLocalUsers(userIds: List<Int>): List<VkUser>
+    suspend fun getLocalUsers(userIds: List<Long>): List<VkUser>
 
     suspend fun storeUsers(users: List<VkUser>)
 }

core/data/src/main/kotlin/dev/meloda/fast/data/api/users/UsersRepositoryImpl.kt

@@ -1,7 +1,8 @@
 package dev.meloda.fast.data.api.users
 
+import com.slack.eithernet.ApiResult
 import dev.meloda.fast.data.VkMemoryCache
-import dev.meloda.fast.database.dao.UsersDao
+import dev.meloda.fast.database.dao.UserDao
 import dev.meloda.fast.model.api.data.VkUserData
 import dev.meloda.fast.model.api.domain.VkUser
 import dev.meloda.fast.model.api.domain.asEntity
@@ -11,18 +12,17 @@ import dev.meloda.fast.model.database.asExternalModel
 import dev.meloda.fast.network.RestApiErrorDomain
 import dev.meloda.fast.network.mapApiResult
 import dev.meloda.fast.network.service.users.UsersService
-import com.slack.eithernet.ApiResult
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 class UsersRepositoryImpl(
     private val service: UsersService,
-    private val dao: UsersDao
+    private val dao: UserDao
 ) : UsersRepository {
 
     override suspend fun get(
-        userIds: List<Int>?,
+        userIds: List<Long>?,
         fields: String?,
         nomCase: String?
     ): ApiResult<List<VkUser>, RestApiErrorDomain> = withContext(Dispatchers.IO) {
@@ -38,7 +38,9 @@ class UsersRepositoryImpl(
 
                 val users = response.map(VkUserData::mapToDomain)
 
-                launch { storeUsers(users) }
+                launch(Dispatchers.IO) {
+                    storeUsers(users)
+                }
 
                 VkMemoryCache.appendUsers(users)
 
@@ -51,7 +53,7 @@ class UsersRepositoryImpl(
     }
 
     override suspend fun getLocalUsers(
-        userIds: List<Int>
+        userIds: List<Long>
     ): List<VkUser> = withContext(Dispatchers.IO) {
         dao.getAllByIds(userIds).map(VkUserEntity::asExternalModel)
     }

core/data/src/main/kotlin/dev/meloda/fast/data/db/AccountsRepository.kt

@@ -6,7 +6,7 @@ interface AccountsRepository {
 
     suspend fun getAccounts(): List<AccountEntity>
 
-    suspend fun getAccountById(userId: Int): AccountEntity?
+    suspend fun getAccountById(userId: Long): AccountEntity?
 
     suspend fun storeAccounts(accounts: List<AccountEntity>)
 }

core/data/src/main/kotlin/dev/meloda/fast/data/db/AccountsRepositoryImpl.kt

@@ -9,7 +9,7 @@ class AccountsRepositoryImpl(
 
     override suspend fun getAccounts(): List<AccountEntity> = accountDao.getAll()
 
-    override suspend fun getAccountById(userId: Int): AccountEntity? =
+    override suspend fun getAccountById(userId: Long): AccountEntity? =
         accountDao.getById(userId)
 
     override suspend fun storeAccounts(

core/data/src/main/kotlin/dev/meloda/fast/data/di/DataModule.kt

@@ -6,8 +6,8 @@ import dev.meloda.fast.data.api.account.AccountRepositoryImpl
 import dev.meloda.fast.data.api.audios.AudiosRepository
 import dev.meloda.fast.data.api.auth.AuthRepository
 import dev.meloda.fast.data.api.auth.AuthRepositoryImpl
-import dev.meloda.fast.data.api.conversations.ConversationsRepository
+import dev.meloda.fast.data.api.convos.ConvosRepository
-import dev.meloda.fast.data.api.conversations.ConversationsRepositoryImpl
+import dev.meloda.fast.data.api.convos.ConvosRepositoryImpl
 import dev.meloda.fast.data.api.files.FilesRepository
 import dev.meloda.fast.data.api.friends.FriendsRepository
 import dev.meloda.fast.data.api.friends.FriendsRepositoryImpl
@@ -45,7 +45,7 @@ val dataModule = module {
 
     singleOf(::AuthRepositoryImpl) bind AuthRepository::class
 
-    singleOf(::ConversationsRepositoryImpl) bind ConversationsRepository::class
+    singleOf(::ConvosRepositoryImpl) bind ConvosRepository::class
 
     singleOf(::FilesRepository)
 
@@ -65,7 +65,6 @@ val dataModule = module {
 
     singleOf(::FriendsRepositoryImpl) bind FriendsRepository::class
 
-    // TODO: 11/08/2024, Danil Nikolaev: find a better solution
     single<Interceptor>(named("token_interceptor")) {
         AccessTokenInterceptor()
     }

core/database/schemas/dev.meloda.fast.database.AccountsDatabase/2.json

@@ -2,11 +2,11 @@
   "formatVersion": 1,
   "database": {
     "version": 2,
-    "identityHash": "3ebd234270e36902d3d461af38664869",
+    "identityHash": "ca007bca2ab4a9b901662792042770ad",
     "entities": [
       {
         "tableName": "accounts",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `accessToken` TEXT NOT NULL, `fastToken` TEXT, `trustedHash` TEXT, PRIMARY KEY(`userId`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `accessToken` TEXT NOT NULL, `fastToken` TEXT, `trustedHash` TEXT, `exchangeToken` TEXT, PRIMARY KEY(`userId`))",
         "fields": [
           {
             "fieldPath": "userId",
@@ -31,6 +31,12 @@
             "columnName": "trustedHash",
             "affinity": "TEXT",
             "notNull": false
+          },
+          {
+            "fieldPath": "exchangeToken",
+            "columnName": "exchangeToken",
+            "affinity": "TEXT",
+            "notNull": false
           }
         ],
         "primaryKey": {
@@ -46,7 +52,7 @@
     "views": [],
     "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, '3ebd234270e36902d3d461af38664869')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ca007bca2ab4a9b901662792042770ad')"
     ]
   }
 }

core/database/schemas/dev.meloda.fast.database.AccountsDatabase/3.json

@@ -0,0 +1,58 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "ca007bca2ab4a9b901662792042770ad",
+    "entities": [
+      {
+        "tableName": "accounts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `accessToken` TEXT NOT NULL, `fastToken` TEXT, `trustedHash` TEXT, `exchangeToken` TEXT, PRIMARY KEY(`userId`))",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accessToken",
+            "columnName": "accessToken",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fastToken",
+            "columnName": "fastToken",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "trustedHash",
+            "columnName": "trustedHash",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "exchangeToken",
+            "columnName": "exchangeToken",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "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, 'ca007bca2ab4a9b901662792042770ad')"
+    ]
+  }
+}

core/database/schemas/dev.meloda.fast.database.CacheDatabase/10.json

@@ -0,0 +1,413 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 10,
+    "identityHash": "6c315b7f800694f635318d86032746ec",
+    "entities": [
+      {
+        "tableName": "users",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `firstName` TEXT NOT NULL, `lastName` TEXT NOT NULL, `isOnline` INTEGER NOT NULL, `isOnlineMobile` INTEGER NOT NULL, `onlineAppId` INTEGER, `lastSeen` INTEGER, `lastSeenStatus` TEXT, `birthday` TEXT, `photo50` TEXT, `photo100` TEXT, `photo200` TEXT, `photo400Orig` TEXT, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "firstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastName",
+            "columnName": "lastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isOnline",
+            "columnName": "isOnline",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isOnlineMobile",
+            "columnName": "isOnlineMobile",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "onlineAppId",
+            "columnName": "onlineAppId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastSeen",
+            "columnName": "lastSeen",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastSeenStatus",
+            "columnName": "lastSeenStatus",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "birthday",
+            "columnName": "birthday",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo50",
+            "columnName": "photo50",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo100",
+            "columnName": "photo100",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo200",
+            "columnName": "photo200",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo400Orig",
+            "columnName": "photo400Orig",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "groups",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `screenName` TEXT NOT NULL, `photo50` TEXT, `photo100` TEXT, `photo200` TEXT, `membersCount` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "screenName",
+            "columnName": "screenName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "photo50",
+            "columnName": "photo50",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo100",
+            "columnName": "photo100",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo200",
+            "columnName": "photo200",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "membersCount",
+            "columnName": "membersCount",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `cmId` INTEGER NOT NULL, `text` TEXT, `isOut` INTEGER NOT NULL, `peerId` INTEGER NOT NULL, `fromId` INTEGER NOT NULL, `date` INTEGER NOT NULL, `randomId` INTEGER NOT NULL, `action` TEXT, `actionMemberId` INTEGER, `actionText` TEXT, `actionCmId` INTEGER, `actionMessage` TEXT, `updateTime` INTEGER, `important` INTEGER NOT NULL, `forwardIds` TEXT, `attachments` TEXT, `replyMessageId` INTEGER, `geoType` TEXT, `pinnedAt` INTEGER, `isPinned` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cmId",
+            "columnName": "cmId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isOut",
+            "columnName": "isOut",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "peerId",
+            "columnName": "peerId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fromId",
+            "columnName": "fromId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "randomId",
+            "columnName": "randomId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "action",
+            "columnName": "action",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "actionMemberId",
+            "columnName": "actionMemberId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "actionText",
+            "columnName": "actionText",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "actionCmId",
+            "columnName": "actionCmId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "actionMessage",
+            "columnName": "actionMessage",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "updateTime",
+            "columnName": "updateTime",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "important",
+            "columnName": "important",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "forwardIds",
+            "columnName": "forwardIds",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "replyMessageId",
+            "columnName": "replyMessageId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "geoType",
+            "columnName": "geoType",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "pinnedAt",
+            "columnName": "pinnedAt",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "isPinned",
+            "columnName": "isPinned",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "conversations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localId` INTEGER NOT NULL, `ownerId` INTEGER, `title` TEXT, `photo50` TEXT, `photo100` TEXT, `photo200` TEXT, `isPhantom` INTEGER NOT NULL, `lastCmId` INTEGER NOT NULL, `inReadCmId` INTEGER NOT NULL, `outReadCmId` INTEGER NOT NULL, `inRead` INTEGER NOT NULL, `outRead` INTEGER NOT NULL, `lastMessageId` INTEGER, `unreadCount` INTEGER NOT NULL, `membersCount` INTEGER, `canChangePin` INTEGER NOT NULL, `canChangeInfo` INTEGER NOT NULL, `majorId` INTEGER NOT NULL, `minorId` INTEGER NOT NULL, `pinnedMessageId` INTEGER, `peerType` TEXT NOT NULL, `isArchived` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "ownerId",
+            "columnName": "ownerId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo50",
+            "columnName": "photo50",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo100",
+            "columnName": "photo100",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo200",
+            "columnName": "photo200",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isPhantom",
+            "columnName": "isPhantom",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastCmId",
+            "columnName": "lastCmId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inReadCmId",
+            "columnName": "inReadCmId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "outReadCmId",
+            "columnName": "outReadCmId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inRead",
+            "columnName": "inRead",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "outRead",
+            "columnName": "outRead",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastMessageId",
+            "columnName": "lastMessageId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "unreadCount",
+            "columnName": "unreadCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "membersCount",
+            "columnName": "membersCount",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "canChangePin",
+            "columnName": "canChangePin",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canChangeInfo",
+            "columnName": "canChangeInfo",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "majorId",
+            "columnName": "majorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minorId",
+            "columnName": "minorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pinnedMessageId",
+            "columnName": "pinnedMessageId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "peerType",
+            "columnName": "peerType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isArchived",
+            "columnName": "isArchived",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "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, '6c315b7f800694f635318d86032746ec')"
+    ]
+  }
+}

core/database/schemas/dev.meloda.fast.database.CacheDatabase/11.json

@@ -0,0 +1,413 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 11,
+    "identityHash": "a746865995959331f8a1b512c049dacb",
+    "entities": [
+      {
+        "tableName": "users",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `firstName` TEXT NOT NULL, `lastName` TEXT NOT NULL, `isOnline` INTEGER NOT NULL, `isOnlineMobile` INTEGER NOT NULL, `onlineAppId` INTEGER, `lastSeen` INTEGER, `lastSeenStatus` TEXT, `birthday` TEXT, `photo50` TEXT, `photo100` TEXT, `photo200` TEXT, `photo400Orig` TEXT, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "firstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastName",
+            "columnName": "lastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isOnline",
+            "columnName": "isOnline",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isOnlineMobile",
+            "columnName": "isOnlineMobile",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "onlineAppId",
+            "columnName": "onlineAppId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastSeen",
+            "columnName": "lastSeen",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastSeenStatus",
+            "columnName": "lastSeenStatus",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "birthday",
+            "columnName": "birthday",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo50",
+            "columnName": "photo50",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo100",
+            "columnName": "photo100",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo200",
+            "columnName": "photo200",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo400Orig",
+            "columnName": "photo400Orig",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "groups",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `screenName` TEXT NOT NULL, `photo50` TEXT, `photo100` TEXT, `photo200` TEXT, `membersCount` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "screenName",
+            "columnName": "screenName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "photo50",
+            "columnName": "photo50",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo100",
+            "columnName": "photo100",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo200",
+            "columnName": "photo200",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "membersCount",
+            "columnName": "membersCount",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `cmId` INTEGER NOT NULL, `text` TEXT, `isOut` INTEGER NOT NULL, `peerId` INTEGER NOT NULL, `fromId` INTEGER NOT NULL, `date` INTEGER NOT NULL, `randomId` INTEGER NOT NULL, `action` TEXT, `actionMemberId` INTEGER, `actionText` TEXT, `actionCmId` INTEGER, `actionMessage` TEXT, `updateTime` INTEGER, `important` INTEGER NOT NULL, `forwardIds` TEXT, `attachments` TEXT, `replyMessageId` INTEGER, `geoType` TEXT, `pinnedAt` INTEGER, `isPinned` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cmId",
+            "columnName": "cmId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isOut",
+            "columnName": "isOut",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "peerId",
+            "columnName": "peerId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fromId",
+            "columnName": "fromId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "randomId",
+            "columnName": "randomId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "action",
+            "columnName": "action",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "actionMemberId",
+            "columnName": "actionMemberId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "actionText",
+            "columnName": "actionText",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "actionCmId",
+            "columnName": "actionCmId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "actionMessage",
+            "columnName": "actionMessage",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "updateTime",
+            "columnName": "updateTime",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "important",
+            "columnName": "important",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "forwardIds",
+            "columnName": "forwardIds",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "replyMessageId",
+            "columnName": "replyMessageId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "geoType",
+            "columnName": "geoType",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "pinnedAt",
+            "columnName": "pinnedAt",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "isPinned",
+            "columnName": "isPinned",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "convos",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localId` INTEGER NOT NULL, `ownerId` INTEGER, `title` TEXT, `photo50` TEXT, `photo100` TEXT, `photo200` TEXT, `isPhantom` INTEGER NOT NULL, `lastCmId` INTEGER NOT NULL, `inReadCmId` INTEGER NOT NULL, `outReadCmId` INTEGER NOT NULL, `inRead` INTEGER NOT NULL, `outRead` INTEGER NOT NULL, `lastMessageId` INTEGER, `unreadCount` INTEGER NOT NULL, `membersCount` INTEGER, `canChangePin` INTEGER NOT NULL, `canChangeInfo` INTEGER NOT NULL, `majorId` INTEGER NOT NULL, `minorId` INTEGER NOT NULL, `pinnedMessageId` INTEGER, `peerType` TEXT NOT NULL, `isArchived` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "ownerId",
+            "columnName": "ownerId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo50",
+            "columnName": "photo50",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo100",
+            "columnName": "photo100",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photo200",
+            "columnName": "photo200",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isPhantom",
+            "columnName": "isPhantom",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastCmId",
+            "columnName": "lastCmId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inReadCmId",
+            "columnName": "inReadCmId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "outReadCmId",
+            "columnName": "outReadCmId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inRead",
+            "columnName": "inRead",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "outRead",
+            "columnName": "outRead",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastMessageId",
+            "columnName": "lastMessageId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "unreadCount",
+            "columnName": "unreadCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "membersCount",
+            "columnName": "membersCount",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "canChangePin",
+            "columnName": "canChangePin",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canChangeInfo",
+            "columnName": "canChangeInfo",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "majorId",
+            "columnName": "majorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minorId",
+            "columnName": "minorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pinnedMessageId",
+            "columnName": "pinnedMessageId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "peerType",
+            "columnName": "peerType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isArchived",
+            "columnName": "isArchived",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "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, 'a746865995959331f8a1b512c049dacb')"
+    ]
+  }
+}

core/database/src/main/kotlin/dev/meloda/fast/database/AccountsDatabase.kt

@@ -7,7 +7,7 @@ import dev.meloda.fast.model.database.AccountEntity
 
 @Database(
     entities = [AccountEntity::class],
-    version = 2
+    version = 3
 )
 abstract class AccountsDatabase : RoomDatabase() {
     abstract fun accountDao(): AccountDao

core/database/src/main/kotlin/dev/meloda/fast/database/CacheDatabase.kt

@@ -3,12 +3,12 @@ package dev.meloda.fast.database
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import dev.meloda.fast.database.dao.ConversationDao
+import dev.meloda.fast.database.dao.ConvoDao
 import dev.meloda.fast.database.dao.GroupDao
 import dev.meloda.fast.database.dao.MessageDao
-import dev.meloda.fast.database.dao.UsersDao
+import dev.meloda.fast.database.dao.UserDao
 import dev.meloda.fast.database.typeconverters.Converters
-import dev.meloda.fast.model.database.VkConversationEntity
+import dev.meloda.fast.model.database.VkConvoEntity
 import dev.meloda.fast.model.database.VkGroupEntity
 import dev.meloda.fast.model.database.VkMessageEntity
 import dev.meloda.fast.model.database.VkUserEntity
@@ -18,15 +18,15 @@ import dev.meloda.fast.model.database.VkUserEntity
         VkUserEntity::class,
         VkGroupEntity::class,
         VkMessageEntity::class,
-        VkConversationEntity::class
+        VkConvoEntity::class
     ],
 
-    version = 7
+    version = 11
 )
 @TypeConverters(Converters::class)
 abstract class CacheDatabase : RoomDatabase() {
-    abstract fun userDao(): UsersDao
+    abstract fun userDao(): UserDao
     abstract fun groupDao(): GroupDao
     abstract fun messageDao(): MessageDao
-    abstract fun conversationDao(): ConversationDao
+    abstract fun convoDao(): ConvoDao
 }

core/database/src/main/kotlin/dev/meloda/fast/database/dao/AccountDao.kt

@@ -11,8 +11,8 @@ abstract class AccountDao : EntityDao<AccountEntity> {
     abstract suspend fun getAll(): List<AccountEntity>
 
     @Query("SELECT * FROM accounts WHERE userId = :userId")
-    abstract suspend fun getById(userId: Int): AccountEntity?
+    abstract suspend fun getById(userId: Long): AccountEntity?
 
     @Query("DELETE FROM accounts WHERE userId = :userId")
-    abstract suspend fun deleteById(userId: Int)
+    abstract suspend fun deleteById(userId: Long)
 }

core/database/src/main/kotlin/dev/meloda/fast/database/dao/ConversationDao.kt

@@ -1,30 +0,0 @@
-package dev.meloda.fast.database.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import androidx.room.Transaction
-import dev.meloda.fast.model.database.ConversationWithMessage
-import dev.meloda.fast.model.database.VkConversationEntity
-
-@Dao
-abstract class ConversationDao : EntityDao<VkConversationEntity> {
-
-    @Query("SELECT * FROM conversations")
-    abstract suspend fun getAll(): List<VkConversationEntity>
-
-    @Query("SELECT * FROM conversations WHERE id IN (:ids)")
-    abstract suspend fun getAllByIds(ids: List<Int>): List<VkConversationEntity>
-
-    @Query("SELECT * FROM conversations WHERE id IS (:id)")
-    abstract suspend fun getById(id: Int): VkConversationEntity?
-
-    @Transaction
-    @Query("SELECT * FROM conversations WHERE id IS (:id)")
-    abstract suspend fun getByIdWithMessage(id: Int): ConversationWithMessage?
-
-    @Query("DELETE FROM conversations WHERE rowid IN (:ids)")
-    abstract suspend fun deleteByIds(ids: List<Int>): Int
-}
-
-
-

core/database/src/main/kotlin/dev/meloda/fast/database/dao/ConvoDao.kt

@@ -0,0 +1,30 @@
+package dev.meloda.fast.database.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.Transaction
+import dev.meloda.fast.model.database.ConvoWithMessage
+import dev.meloda.fast.model.database.VkConvoEntity
+
+@Dao
+abstract class ConvoDao : EntityDao<VkConvoEntity> {
+
+    @Query("SELECT * FROM convos")
+    abstract suspend fun getAll(): List<VkConvoEntity>
+
+    @Query("SELECT * FROM convos WHERE id IN (:ids)")
+    abstract suspend fun getAllByIds(ids: List<Int>): List<VkConvoEntity>
+
+    @Query("SELECT * FROM convos WHERE id IS (:id)")
+    abstract suspend fun getById(id: Long): VkConvoEntity?
+
+    @Transaction
+    @Query("SELECT * FROM convos WHERE id IS (:id)")
+    abstract suspend fun getByIdWithMessage(id: Long): ConvoWithMessage?
+
+    @Query("DELETE FROM convos WHERE rowid IN (:ids)")
+    abstract suspend fun deleteByIds(ids: List<Int>): Int
+}
+
+
+

core/database/src/main/kotlin/dev/meloda/fast/database/dao/MessageDao.kt

@@ -10,14 +10,14 @@ abstract class MessageDao : EntityDao<VkMessageEntity> {
     @Query("SELECT * FROM messages")
     abstract suspend fun getAll(): List<VkMessageEntity>
 
-    @Query("SELECT * FROM messages WHERE peerId IS (:conversationId)")
+    @Query("SELECT * FROM messages WHERE peerId IS (:convoId)")
-    abstract suspend fun getAll(conversationId: Int): List<VkMessageEntity>
+    abstract suspend fun getAll(convoId: Long): List<VkMessageEntity>
 
     @Query("SELECT * FROM messages WHERE id IN (:ids)")
     abstract suspend fun getAllByIds(ids: List<Int>): List<VkMessageEntity>
 
     @Query("SELECT * FROM messages WHERE id IS (:messageId)")
-    abstract suspend fun getById(messageId: Int): VkMessageEntity?
+    abstract suspend fun getById(messageId: Long): VkMessageEntity?
 
     @Query("DELETE FROM messages WHERE id IN (:ids)")
     abstract suspend fun deleteByIds(ids: List<Int>): Int

core/database/src/main/kotlin/dev/meloda/fast/database/dao/UserDao.kt

@@ -5,14 +5,14 @@ import androidx.room.Query
 import dev.meloda.fast.model.database.VkUserEntity
 
 @Dao
-abstract class UsersDao : EntityDao<VkUserEntity> {
+abstract class UserDao : EntityDao<VkUserEntity> {
 
     @Query("SELECT * FROM users")
     abstract suspend fun getAll(): List<VkUserEntity>
 
     @Query("SELECT * FROM users WHERE id IN (:ids)")
-    abstract suspend fun getAllByIds(ids: List<Int>): List<VkUserEntity>
+    abstract suspend fun getAllByIds(ids: List<Long>): List<VkUserEntity>
 
     @Query("DELETE FROM users WHERE id IN (:ids)")
-    abstract suspend fun deleteByIds(ids: List<Int>): Int
+    abstract suspend fun deleteByIds(ids: List<Long>): Int
 }

core/database/src/main/kotlin/dev/meloda/fast/database/di/DatabaseModule.kt

@@ -2,24 +2,28 @@ package dev.meloda.fast.database.di
 
 import androidx.room.Room
 import dev.meloda.fast.database.AccountsDatabase
+import dev.meloda.fast.database.CacheDatabase
+import dev.meloda.fast.database.di.migration.migrationFrom2To3
 import org.koin.core.scope.Scope
 import org.koin.dsl.module
 
 val databaseModule = module {
     single {
-        Room.databaseBuilder(get(), AccountsDatabase::class.java, "accounts").build()
+        Room.databaseBuilder(get(), AccountsDatabase::class.java, "accounts")
+            .addMigrations(migrationFrom2To3)
+            .build()
     }
     single { get<AccountsDatabase>().accountDao() }
 
     single {
-        Room.databaseBuilder(get(), dev.meloda.fast.database.CacheDatabase::class.java, "cache")
+        Room.databaseBuilder(get(), CacheDatabase::class.java, "cache")
-            .fallbackToDestructiveMigration()
+            .fallbackToDestructiveMigration(true)
             .build()
     }
     single { cacheDB().userDao() }
     single { cacheDB().groupDao() }
     single { cacheDB().messageDao() }
-    single { cacheDB().conversationDao() }
+    single { cacheDB().convoDao() }
 }
 
-private fun Scope.cacheDB(): dev.meloda.fast.database.CacheDatabase = get()
+private fun Scope.cacheDB(): CacheDatabase = get()

core/database/src/main/kotlin/dev/meloda/fast/database/di/migration/MigrationFrom2To3.kt

@@ -0,0 +1,14 @@
+package dev.meloda.fast.database.di.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+val migrationFrom2To3 = object : Migration(
+    startVersion = 2,
+    endVersion = 3
+) {
+
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE accounts ADD COLUMN exchangeToken TEXT DEFAULT null")
+    }
+}

core/database/src/main/kotlin/dev/meloda/fast/database/typeconverters/Converters.kt

@@ -13,6 +13,15 @@ class Converters {
             .split(", ")
             .mapNotNull(String::toIntOrNull)
 
+    @TypeConverter
+    fun longListToString(list: List<Long>): String = list.joinToString()
+
+    @TypeConverter
+    fun stringToLongList(string: String): List<Long> =
+        string
+            .split(", ")
+            .mapNotNull(String::toLongOrNull)
+
     @TypeConverter
     fun stringListToString(list: List<String>): String = list.joinToString()
 

core/datastore/src/main/kotlin/dev/meloda/fast/datastore/AppSettings.kt

@@ -4,13 +4,32 @@ import android.content.SharedPreferences
 import androidx.core.content.edit
 import dev.meloda.fast.common.model.DarkMode
 import dev.meloda.fast.common.model.LogLevel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
 import kotlin.properties.Delegates
 import kotlin.reflect.KClass
 
+sealed class CaptchaTokenResult {
+    data object Initial : CaptchaTokenResult()
+    data object Null : CaptchaTokenResult()
+    data object Cancelled : CaptchaTokenResult()
+    data class Success(val token: String) : CaptchaTokenResult()
+}
+
 object AppSettings {
 
     private var preferences: SharedPreferences by Delegates.notNull()
 
+    private val captchaResult = MutableStateFlow<CaptchaTokenResult>(CaptchaTokenResult.Initial)
+    fun getCaptchaResultFlow(): StateFlow<CaptchaTokenResult> = captchaResult.asStateFlow()
+    fun setCaptchaResult(result: CaptchaTokenResult) = captchaResult.update { result }
+
+    private val captchaRedirectUri = MutableStateFlow<String?>(null)
+    fun getCaptchaRedirectUriFlow() = captchaRedirectUri.asStateFlow()
+    fun setCaptchaRedirectUri(redirectUri: String?) = captchaRedirectUri.update { redirectUri }
+
     fun init(preferences: SharedPreferences) {
         this.preferences = preferences
     }
@@ -96,6 +115,20 @@ object AppSettings {
             )
             set(value) = put(SettingsKeys.KEY_SHOW_EMOJI_BUTTON, value)
 
+        var showAttachmentButton: Boolean
+            get() = get(
+                SettingsKeys.KEY_SHOW_ATTACHMENT_BUTTON,
+                SettingsKeys.DEFAULT_VALUE_SHOW_ATTACHMENT_BUTTON
+            )
+            set(value) = put(SettingsKeys.KEY_SHOW_ATTACHMENT_BUTTON, value)
+
+        var showManualRefreshOptions: Boolean
+            get() = get(
+                SettingsKeys.KEY_SHOW_MANUAL_REFRESH_OPTIONS,
+                SettingsKeys.DEFAULT_VALUE_SHOW_MANUAL_REFRESH_OPTIONS
+            )
+            set(value) = put(SettingsKeys.KEY_SHOW_MANUAL_REFRESH_OPTIONS, value)
+
         var enableHaptic: Boolean
             get() = get(
                 SettingsKeys.KEY_ENABLE_HAPTIC,

core/datastore/src/main/kotlin/dev/meloda/fast/datastore/SettingsKeys.kt

@@ -11,6 +11,10 @@ object SettingsKeys {
     const val DEFAULT_VALUE_USE_CONTACT_NAMES = false
     const val KEY_SHOW_EMOJI_BUTTON = "show_emoji_button"
     const val DEFAULT_VALUE_KEY_SHOW_EMOJI_BUTTON = false
+    const val KEY_SHOW_ATTACHMENT_BUTTON = "show_attachment_button"
+    const val DEFAULT_VALUE_SHOW_ATTACHMENT_BUTTON = false
+    const val KEY_SHOW_MANUAL_REFRESH_OPTIONS = "show_manual_refresh_options"
+    const val DEFAULT_VALUE_SHOW_MANUAL_REFRESH_OPTIONS = false
 
     const val KEY_APPEARANCE = "appearance"
     const val KEY_APPEARANCE_MULTILINE = "appearance_multiline"
@@ -45,7 +49,10 @@ object SettingsKeys {
     const val KEY_ENABLE_HAPTIC = "enable_haptic"
     const val DEFAULT_ENABLE_HAPTIC = true
     const val KEY_DEBUG_NETWORK_LOG_LEVEL = "debug_network_log_level"
-    const val DEFAULT_NETWORK_LOG_LEVEL = 0
+    const val DEFAULT_NETWORK_LOG_LEVEL = 3
+    const val KEY_DEBUG_IMPORT_AUTH_DATA = "debug_import_auth_data"
+    const val KEY_DEBUG_EXPORT_AUTH_DATA = "debug_export_auth_data"
+
     const val KEY_USE_SYSTEM_FONT = "use_system_font"
     const val DEFAULT_USE_SYSTEM_FONT = false
     const val KEY_MORE_ANIMATIONS = "more_animations"
@@ -53,5 +60,5 @@ object SettingsKeys {
 
 
     const val KEY_SHOW_DEBUG_CATEGORY = "show_debug_category"
-    const val ID_DMITRY = 37610580
+    const val ID_DMITRY = 37610580L
 }

core/datastore/src/main/kotlin/dev/meloda/fast/datastore/UserSettings.kt

@@ -14,16 +14,12 @@ interface UserSettings {
     val enableDynamicColors: StateFlow<Boolean>
     val appLanguage: StateFlow<String>
 
-    val fastText: StateFlow<String>
-
     val sendOnlineStatus: StateFlow<Boolean>
 
-    val showAlertAfterCrash: StateFlow<Boolean>
     val longPollInBackground: StateFlow<Boolean>
     val useBlur: StateFlow<Boolean>
-    val showEmojiButton: StateFlow<Boolean>
-    val showTimeInActionMessages: StateFlow<Boolean>
     val useSystemFont: StateFlow<Boolean>
+    val enableAnimations: StateFlow<Boolean>
     val showDebugCategory: StateFlow<Boolean>
 
     fun onUseContactNamesChanged(use: Boolean)
@@ -34,15 +30,10 @@ interface UserSettings {
     fun onEnableDynamicColorsChanged(enable: Boolean)
     fun onAppLanguageChanged(language: String)
 
-    fun onFastTextChanged(text: String)
-
     fun onSendOnlineStatusChanged(send: Boolean)
 
-    fun onShowAlertAfterCrashChanged(show: Boolean)
     fun onLongPollInBackgroundChanged(inBackground: Boolean)
     fun onUseBlurChanged(use: Boolean)
-    fun onShowEmojiButtonChanged(show: Boolean)
-    fun onShowTimeInActionMessagesChanged(show: Boolean)
     fun onUseSystemFontChanged(use: Boolean)
     fun onShowDebugCategoryChanged(show: Boolean)
 }
@@ -57,17 +48,13 @@ class UserSettingsImpl : UserSettings {
     override val enableDynamicColors = MutableStateFlow(AppSettings.Appearance.enableDynamicColors)
     override val appLanguage = MutableStateFlow(AppSettings.Appearance.appLanguage)
 
-    override val fastText = MutableStateFlow(AppSettings.Features.fastText)
-
     override val sendOnlineStatus = MutableStateFlow(AppSettings.Activity.sendOnlineStatus)
 
-    override val showAlertAfterCrash = MutableStateFlow(AppSettings.Debug.showAlertAfterCrash)
+    override val longPollInBackground =
-    override val longPollInBackground = MutableStateFlow(AppSettings.Experimental.longPollInBackground)
+        MutableStateFlow(AppSettings.Experimental.longPollInBackground)
     override val useBlur = MutableStateFlow(AppSettings.Experimental.useBlur)
-    override val showEmojiButton = MutableStateFlow(AppSettings.General.showEmojiButton)
-    override val showTimeInActionMessages =
-        MutableStateFlow(AppSettings.Experimental.showTimeInActionMessages)
     override val useSystemFont = MutableStateFlow(AppSettings.Appearance.useSystemFont)
+    override val enableAnimations = MutableStateFlow(AppSettings.Experimental.moreAnimations)
     override val showDebugCategory = MutableStateFlow(AppSettings.Debug.showDebugCategory)
 
     override fun onUseContactNamesChanged(use: Boolean) {
@@ -94,18 +81,10 @@ class UserSettingsImpl : UserSettings {
         appLanguage.value = language
     }
 
-    override fun onFastTextChanged(text: String) {
-        fastText.value = text
-    }
-
     override fun onSendOnlineStatusChanged(send: Boolean) {
         sendOnlineStatus.value = send
     }
 
-    override fun onShowAlertAfterCrashChanged(show: Boolean) {
-        showAlertAfterCrash.value = show
-    }
-
     override fun onLongPollInBackgroundChanged(inBackground: Boolean) {
         longPollInBackground.value = inBackground
     }
@@ -114,14 +93,6 @@ class UserSettingsImpl : UserSettings {
         useBlur.value = use
     }
 
-    override fun onShowEmojiButtonChanged(show: Boolean) {
-        showEmojiButton.value = show
-    }
-
-    override fun onShowTimeInActionMessagesChanged(show: Boolean) {
-        showTimeInActionMessages.value = show
-    }
-
     override fun onUseSystemFontChanged(use: Boolean) {
         useSystemFont.value = use
     }

core/domain/build.gradle.kts

@@ -8,11 +8,16 @@ android {
 }
 
 dependencies {
+    api(projects.core.common)
     api(projects.core.data)
     api(projects.core.model)
 
-    // TODO: 11/08/2024, Danil Nikolaev: remove?
     implementation(libs.kotlinx.coroutines.core)
     implementation(libs.koin.core)
     implementation(libs.eithernet)
+
+    implementation(libs.bundles.nanokt)
+
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.ui)
 }

core/domain/src/main/kotlin/dev/meloda/fast/domain/AuthUseCase.kt

@@ -1,12 +1,32 @@
 package dev.meloda.fast.domain
 
 import dev.meloda.fast.data.State
+import dev.meloda.fast.model.api.responses.ExchangeSilentTokenResponse
+import dev.meloda.fast.model.api.responses.GetAnonymTokenResponse
+import dev.meloda.fast.model.api.responses.GetExchangeTokenResponse
 import dev.meloda.fast.model.api.responses.ValidatePhoneResponse
 import kotlinx.coroutines.flow.Flow
 
-interface AuthUseCase {
+interface AuthUseCase : BaseUseCase {
+
+    fun logout(): Flow<State<Int>>
 
     fun validatePhone(
         validationSid: String
     ): Flow<State<ValidatePhoneResponse>>
+
+    suspend fun getAnonymToken(
+        clientId: String,
+        clientSecret: String
+    ): Flow<State<GetAnonymTokenResponse>>
+
+    suspend fun exchangeSilentToken(
+        anonymToken: String,
+        silentToken: String,
+        silentUuid: String
+    ): Flow<State<ExchangeSilentTokenResponse>>
+
+    suspend fun getExchangeToken(
+        accessToken: String
+    ): Flow<State<GetExchangeTokenResponse>>
 }

core/domain/src/main/kotlin/dev/meloda/fast/domain/AuthUseCaseImpl.kt

@@ -3,16 +3,44 @@ package dev.meloda.fast.domain
 import dev.meloda.fast.data.State
 import dev.meloda.fast.data.api.auth.AuthRepository
 import dev.meloda.fast.data.mapToState
+import dev.meloda.fast.model.api.responses.ExchangeSilentTokenResponse
+import dev.meloda.fast.model.api.responses.GetAnonymTokenResponse
+import dev.meloda.fast.model.api.responses.GetExchangeTokenResponse
 import dev.meloda.fast.model.api.responses.ValidatePhoneResponse
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
 
 class AuthUseCaseImpl(private val repository: AuthRepository) : AuthUseCase {
 
-    override fun validatePhone(validationSid: String): Flow<State<ValidatePhoneResponse>> = flow {
+    override fun logout(): Flow<State<Int>> = flowNewState { repository.logout().mapToState() }
-        emit(State.Loading)
 
-        val newState = repository.validatePhone(validationSid).mapToState()
+    override fun validatePhone(validationSid: String): Flow<State<ValidatePhoneResponse>> =
-        emit(newState)
+        flowNewState { repository.validatePhone(validationSid = validationSid).mapToState() }
+
+    override suspend fun getAnonymToken(
+        clientId: String,
+        clientSecret: String
+    ): Flow<State<GetAnonymTokenResponse>> = flowNewState {
+        repository.getAnonymToken(
+            clientId = clientId,
+            clientSecret = clientSecret
+        ).mapToState()
+    }
+
+    override suspend fun exchangeSilentToken(
+        anonymToken: String,
+        silentToken: String,
+        silentUuid: String
+    ): Flow<State<ExchangeSilentTokenResponse>> = flowNewState {
+        repository.exchangeSilentToken(
+            anonymToken = anonymToken,
+            silentToken = silentToken,
+            silentUuid = silentUuid
+        ).mapToState()
+    }
+
+    override suspend fun getExchangeToken(
+        accessToken: String
+    ): Flow<State<GetExchangeTokenResponse>> = flowNewState {
+        repository.getExchangeToken(accessToken = accessToken).mapToState()
     }
 }

core/domain/src/main/kotlin/dev/meloda/fast/domain/BaseUseCase.kt

@@ -0,0 +1,16 @@
+package dev.meloda.fast.domain
+
+import dev.meloda.fast.data.State
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.flow
+
+interface BaseUseCase {
+
+    suspend fun <T> FlowCollector<State<T>>.emitState(stateBlock: suspend () -> State<T>) {
+        emit(State.Loading)
+        emit(stateBlock())
+    }
+
+    fun <T> flowNewState(stateBlock: suspend () -> State<T>) =
+        flow { emitState(stateBlock) }
+}

core/domain/src/main/kotlin/dev/meloda/fast/domain/ConversationsUseCase.kt

@@ -1,19 +0,0 @@
-package dev.meloda.fast.domain
-
-import dev.meloda.fast.data.State
-import dev.meloda.fast.model.api.domain.VkConversation
-import kotlinx.coroutines.flow.Flow
-
-interface ConversationsUseCase {
-
-    fun getConversations(
-        count: Int?,
-        offset: Int?,
-    ): Flow<State<List<VkConversation>>>
-
-    fun delete(peerId: Int): Flow<State<Int>>
-
-    fun changePinState(peerId: Int, pin: Boolean): Flow<State<Int>>
-
-    suspend fun storeConversations(conversations: List<VkConversation>)
-}

core/domain/src/main/kotlin/dev/meloda/fast/domain/ConversationsUseCaseImpl.kt

@@ -1,118 +0,0 @@
-package dev.meloda.fast.domain
-
-import dev.meloda.fast.data.State
-import dev.meloda.fast.data.api.conversations.ConversationsRepository
-import dev.meloda.fast.data.mapToState
-import dev.meloda.fast.model.api.domain.VkConversation
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.withContext
-
-class ConversationsUseCaseImpl(
-    private val repository: ConversationsRepository,
-) : ConversationsUseCase {
-
-    //    override fun getConversations(
-//        count: Int?,
-//        offset: Int?,
-//        fields: String,
-//        filter: String,
-//        extended: Boolean?,
-//        startMessageId: Int?
-//    ): Flow<dev.meloda.fast.network.State<ConversationsResponseDomain>> = flow {
-//        emit(dev.meloda.fast.network.State.Loading)
-//
-//        val newState = conversationsRepository.getConversations(
-//            params = ConversationsGetRequest(
-//                count = count,
-//                offset = offset,
-//                fields = fields,
-//                filter = filter,
-//                extended = extended,
-//                startMessageId = startMessageId
-//            )
-//        ).fold(
-//            onSuccess = { response -> dev.meloda.fast.network.State.Success(response.toDomain()) },
-//            onNetworkFailure = { dev.meloda.fast.network.State.Error.ConnectionError },
-//            onUnknownFailure = { dev.meloda.fast.network.State.UNKNOWN_ERROR },
-//            onHttpFailure = { result -> result.error.toStateApiError() },
-//            onApiFailure = { result -> result.error.toStateApiError() }
-//        )
-//        emit(newState)
-//    }
-//
-
-    //
-//    override fun pin(peerId: Int): Flow<dev.meloda.fast.network.State<Unit>> = flow {
-//        emit(dev.meloda.fast.network.State.Loading)
-//
-//        val newState = conversationsRepository.pin(
-//            ConversationsPinRequest(peerId = peerId)
-//        ).fold(
-//            onSuccess = { dev.meloda.fast.network.State.Success(Unit) },
-//            onNetworkFailure = { dev.meloda.fast.network.State.Error.ConnectionError },
-//            onUnknownFailure = { dev.meloda.fast.network.State.UNKNOWN_ERROR },
-//            onHttpFailure = { result -> result.error.toStateApiError() },
-//            onApiFailure = { result -> result.error.toStateApiError() }
-//        )
-//        emit(newState)
-//    }
-//
-//    override fun unpin(peerId: Int): Flow<dev.meloda.fast.network.State<Unit>> = flow {
-//        emit(dev.meloda.fast.network.State.Loading)
-//
-//        val newState = conversationsRepository.unpin(
-//            ConversationsUnpinRequest(peerId = peerId)
-//        ).fold(
-//            onSuccess = { dev.meloda.fast.network.State.Success(Unit) },
-//            onNetworkFailure = { dev.meloda.fast.network.State.Error.ConnectionError },
-//            onUnknownFailure = { dev.meloda.fast.network.State.UNKNOWN_ERROR },
-//            onHttpFailure = { result -> result.error.toStateApiError() },
-//            onApiFailure = { result -> result.error.toStateApiError() }
-//        )
-//        emit(newState)
-//    }
-//
-//    override suspend fun storeConversations(conversations: List<VkConversationDomain>) {
-//        conversationsDao.insertAll(conversations.map(VkConversationDomain::mapToDb))
-//    }
-//
-//    override suspend fun storeGroups(groups: List<VkGroupDomain>) {
-//        groupsDao.insertAll(groups.map(VkGroupDomain::mapToDB))
-//    }
-    override fun getConversations(
-        count: Int?,
-        offset: Int?
-    ): Flow<State<List<VkConversation>>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.getConversations(count, offset).mapToState()
-        emit(newState)
-    }
-
-    override suspend fun storeConversations(
-        conversations: List<VkConversation>
-    ) = withContext(Dispatchers.IO) {
-        repository.storeConversations(conversations)
-    }
-
-    override fun delete(peerId: Int): Flow<State<Int>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.delete(peerId = peerId).mapToState()
-        emit(newState)
-    }
-
-    override fun changePinState(peerId: Int, pin: Boolean): Flow<State<Int>> = flow {
-        emit(State.Loading)
-
-        val newState = if (pin) {
-            repository.pin(peerId)
-        } else {
-            repository.unpin(peerId)
-        }.mapToState()
-
-        emit(newState)
-    }
-}

core/domain/src/main/kotlin/dev/meloda/fast/domain/ConvoUseCase.kt

@@ -0,0 +1,29 @@
+package dev.meloda.fast.domain
+
+import dev.meloda.fast.data.State
+import dev.meloda.fast.model.ConvosFilter
+import dev.meloda.fast.model.api.domain.VkConvo
+import kotlinx.coroutines.flow.Flow
+
+interface ConvoUseCase : BaseUseCase {
+
+    suspend fun storeConvos(convos: List<VkConvo>)
+
+    fun getConvos(
+        count: Int? = null,
+        offset: Int? = null,
+        filter: ConvosFilter
+    ): Flow<State<List<VkConvo>>>
+
+    fun getById(
+        peerIds: List<Long>,
+        extended: Boolean? = null,
+        fields: String? = null
+    ): Flow<State<List<VkConvo>>>
+
+    fun delete(peerId: Long): Flow<State<Long>>
+
+    fun changePinState(peerId: Long, pin: Boolean): Flow<State<Int>>
+
+    fun changeArchivedState(peerId: Long, archive: Boolean): Flow<State<Int>>
+}

core/domain/src/main/kotlin/dev/meloda/fast/domain/ConvoUseCaseImpl.kt

@@ -0,0 +1,71 @@
+package dev.meloda.fast.domain
+
+import dev.meloda.fast.data.State
+import dev.meloda.fast.data.api.convos.ConvosRepository
+import dev.meloda.fast.data.mapToState
+import dev.meloda.fast.model.ConvosFilter
+import dev.meloda.fast.model.api.domain.VkConvo
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.withContext
+
+class ConvoUseCaseImpl(
+    private val repository: ConvosRepository,
+) : ConvoUseCase {
+
+    override suspend fun storeConvos(
+        convos: List<VkConvo>
+    ) = withContext(Dispatchers.IO) {
+        repository.storeConvos(convos)
+    }
+
+    override fun getConvos(
+        count: Int?,
+        offset: Int?,
+        filter: ConvosFilter
+    ): Flow<State<List<VkConvo>>> = flowNewState {
+        repository.getConvos(
+            count = count,
+            offset = offset,
+            filter = filter
+        ).mapToState()
+    }
+
+    override fun getById(
+        peerIds: List<Long>,
+        extended: Boolean?,
+        fields: String?
+    ): Flow<State<List<VkConvo>>> = flowNewState {
+        repository.getConvosById(
+            peerIds = peerIds,
+            extended = extended,
+            fields = fields
+        ).mapToState()
+    }
+
+    override fun delete(peerId: Long): Flow<State<Long>> = flowNewState {
+        repository.delete(peerId = peerId).mapToState()
+    }
+
+    override fun changePinState(
+        peerId: Long,
+        pin: Boolean
+    ): Flow<State<Int>> = flowNewState {
+        if (pin) {
+            repository.pin(peerId)
+        } else {
+            repository.unpin(peerId)
+        }.mapToState()
+    }
+
+    override fun changeArchivedState(
+        peerId: Long,
+        archive: Boolean
+    ): Flow<State<Int>> = flowNewState {
+        if (archive) {
+            repository.archive(peerId)
+        } else {
+            repository.unarchive(peerId)
+        }.mapToState()
+    }
+}

core/domain/src/main/kotlin/dev/meloda/fast/domain/FriendsUseCase.kt

@@ -8,11 +8,13 @@ import kotlinx.coroutines.flow.Flow
 interface FriendsUseCase {
 
     fun getAllFriends(
+        order: String = "hints",
         count: Int?,
         offset: Int?
     ): Flow<State<FriendsInfo>>
 
     fun getFriends(
+        order: String = "hints",
         count: Int?,
         offset: Int?
     ): Flow<State<List<VkUser>>>
@@ -20,7 +22,7 @@ interface FriendsUseCase {
     fun getOnlineFriends(
         count: Int?,
         offset: Int?
-    ): Flow<State<List<Int>>>
+    ): Flow<State<List<Long>>>
 
     suspend fun storeUsers(users: List<VkUser>)
 }

core/domain/src/main/kotlin/dev/meloda/fast/domain/FriendsUseCaseImpl.kt

@@ -11,25 +11,32 @@ import kotlinx.coroutines.flow.flow
 class FriendsUseCaseImpl(private val repository: FriendsRepository) :
     FriendsUseCase {
 
-    override fun getAllFriends(count: Int?, offset: Int?): Flow<State<FriendsInfo>> = flow {
+    override fun getAllFriends(order: String, count: Int?, offset: Int?): Flow<State<FriendsInfo>> = flow {
         emit(State.Loading)
 
-        val newState = repository.getAllFriends(count, offset).mapToState()
+        val newState = repository.getAllFriends(order, count, offset).mapToState()
         emit(newState)
     }
 
     override fun getFriends(
-        count: Int?, offset: Int?
+        order: String,
+        count: Int?,
+        offset: Int?
     ): Flow<State<List<VkUser>>> = flow {
         emit(State.Loading)
 
-        val newState = repository.getFriends(count, offset).mapToState()
+        val newState = repository.getFriends(
+            order = order,
+            count = count,
+            offset = offset
+        ).mapToState()
+
         emit(newState)
     }
 
     override fun getOnlineFriends(
         count: Int?, offset: Int?
-    ): Flow<State<List<Int>>> = flow {
+    ): Flow<State<List<Long>>> = flow {
         emit(State.Loading)
 
         val newState = repository.getOnlineFriends(count, offset).mapToState()

core/domain/src/main/kotlin/dev/meloda/fast/domain/GetCurrentAccountUseCase.kt

@@ -6,10 +6,7 @@ import dev.meloda.fast.model.database.AccountEntity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
-class GetCurrentAccountUseCase(
+class GetCurrentAccountUseCase(private val accountsRepository: AccountsRepository) {
-    private val accountsRepository: AccountsRepository
-) {
-
     suspend operator fun invoke(): AccountEntity? = withContext(Dispatchers.IO) {
         accountsRepository.getAccountById(UserConfig.currentUserId)
     }

core/domain/src/main/kotlin/dev/meloda/fast/domain/GetLocalUserByIdUseCase.kt

@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.flow
 
 class GetLocalUserByIdUseCase(private val repository: UsersRepository) {
 
-    operator fun invoke(userId: Int): Flow<State<VkUser?>> = flow {
+    operator fun invoke(userId: Long): Flow<State<VkUser?>> = flow {
         emit(State.Loading)
 
         val newState = kotlin.runCatching {
@@ -21,7 +21,7 @@ class GetLocalUserByIdUseCase(private val repository: UsersRepository) {
         emit(newState)
     }
 
-    suspend fun proceed(userId: Int): VkUser? {
+    suspend fun proceed(userId: Long): VkUser? {
         return repository.getLocalUsers(userIds = listOf(userId)).singleOrNull()
     }
 }

core/domain/src/main/kotlin/dev/meloda/fast/domain/GetLocalUsersByIdsUseCase.kt

@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.flow
 
 class GetLocalUsersByIdsUseCase(private val repository: UsersRepository) {
 
-    operator fun invoke(userIds: List<Int>): Flow<State<List<VkUser>>> = flow {
+    operator fun invoke(userIds: List<Long>): Flow<State<List<VkUser>>> = flow {
         emit(State.Loading)
 
         val newState = kotlin.runCatching {

core/domain/src/main/kotlin/dev/meloda/fast/domain/GetMessageReadPeersUseCase.kt

@@ -0,0 +1,21 @@
+package dev.meloda.fast.domain
+
+import dev.meloda.fast.data.State
+import dev.meloda.fast.data.api.messages.MessagesRepository
+import dev.meloda.fast.data.mapToState
+import kotlinx.coroutines.flow.Flow
+
+class GetMessageReadPeersUseCase(
+    private val repository: MessagesRepository
+) : BaseUseCase {
+
+    operator fun invoke(
+        peerId: Long,
+        cmId: Long
+    ): Flow<State<Int>> = flowNewState {
+        repository.getMessageReadPeers(
+            peerId = peerId,
+            cmId = cmId
+        ).mapToState(successMapper = { it.totalCount })
+    }
+}

core/domain/src/main/kotlin/dev/meloda/fast/domain/LoadConversationsByIdUseCase.kt

@@ -1,23 +0,0 @@
-package dev.meloda.fast.domain
-
-import dev.meloda.fast.data.State
-import dev.meloda.fast.data.api.conversations.ConversationsRepository
-import dev.meloda.fast.data.mapToState
-import dev.meloda.fast.model.api.domain.VkConversation
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-
-class LoadConversationsByIdUseCase(
-    private val conversationsRepository: ConversationsRepository
-) {
-
-    operator fun invoke(peerIds: List<Int>): Flow<State<List<VkConversation>>> = flow {
-        emit(State.Loading)
-
-        val newState = conversationsRepository
-            .getConversationsById(peerIds = peerIds)
-            .mapToState()
-
-        emit(newState)
-    }
-}

core/domain/src/main/kotlin/dev/meloda/fast/domain/LoadConvosByIdUseCase.kt

@@ -0,0 +1,25 @@
+package dev.meloda.fast.domain
+
+import dev.meloda.fast.data.State
+import dev.meloda.fast.data.api.convos.ConvosRepository
+import dev.meloda.fast.data.mapToState
+import dev.meloda.fast.model.api.domain.VkConvo
+import kotlinx.coroutines.flow.Flow
+
+class LoadConvosByIdUseCase(
+    private val convosRepository: ConvosRepository
+) : BaseUseCase {
+
+    operator fun invoke(
+        peerIds: List<Long>,
+        extended: Boolean? = null,
+        fields: String? = null
+    ): Flow<State<List<VkConvo>>> = flowNewState {
+        convosRepository
+            .getConvosById(
+                peerIds = peerIds,
+                extended = extended,
+                fields = fields,
+            ).mapToState()
+    }
+}

core/domain/src/main/kotlin/dev/meloda/fast/domain/LoadUserByIdUseCase.kt

@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.flow
 class LoadUserByIdUseCase(private val repository: UsersRepository) {
 
     operator fun invoke(
-        userId: Int?,
+        userId: Long?,
         fields: String = VkConstants.USER_FIELDS,
         nomCase: String? = null
     ): Flow<State<VkUser?>> = flow {

core/domain/src/main/kotlin/dev/meloda/fast/domain/LoadUsersByIdsUseCase.kt

@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.flow
 class LoadUsersByIdsUseCase(private val repository: UsersRepository) {
 
     operator fun invoke(
-        userIds: List<Int>?,
+        userIds: List<Long>?,
         fields: String = VkConstants.USER_FIELDS,
         nomCase: String? = null
     ): Flow<State<List<VkUser>>> = flow {

core/domain/src/main/kotlin/dev/meloda/fast/domain/LongPollUpdatesParser.kt

@@ -3,30 +3,39 @@ package dev.meloda.fast.domain
 import android.util.Log
 import dev.meloda.fast.common.VkConstants
 import dev.meloda.fast.common.extensions.asInt
+import dev.meloda.fast.common.extensions.asLong
 import dev.meloda.fast.common.extensions.listenValue
 import dev.meloda.fast.common.extensions.toList
 import dev.meloda.fast.data.UserConfig
-import dev.meloda.fast.data.VkMemoryCache
 import dev.meloda.fast.data.processState
 import dev.meloda.fast.model.ApiEvent
+import dev.meloda.fast.model.ConvoFlags
 import dev.meloda.fast.model.InteractionType
 import dev.meloda.fast.model.LongPollEvent
+import dev.meloda.fast.model.LongPollParsedEvent
+import dev.meloda.fast.model.MessageFlags
+import dev.meloda.fast.model.api.domain.VkConvo
+import dev.meloda.fast.model.api.domain.VkMessage
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
 class LongPollUpdatesParser(
+    private val convoUseCase: ConvoUseCase,
     private val messagesUseCase: MessagesUseCase
 ) {
     private val job = SupervisorJob()
 
-    private val exceptionHandler = CoroutineExceptionHandler { _, throwable ->
+    private val exceptionHandler =
-        Log.d("LongPollUpdatesParser", "error: $throwable")
+        CoroutineExceptionHandler { _, throwable ->
+            Log.e("LongPollUpdatesParser", "error: $throwable")
             throwable.printStackTrace()
         }
 
@@ -35,7 +44,7 @@ class LongPollUpdatesParser(
 
     private val coroutineScope = CoroutineScope(coroutineContext)
 
-    private val listenersMap: MutableMap<ApiEvent, MutableCollection<VkEventCallback<*>>> =
+    private val listenersMap: MutableMap<LongPollEvent, MutableList<VkEventCallback<LongPollParsedEvent>>> =
         mutableMapOf()
 
     fun parseNextUpdate(event: List<Any>) {
@@ -50,8 +59,11 @@ class LongPollUpdatesParser(
             ApiEvent.MESSAGE_EDIT -> parseMessageEdit(eventType, event)
             ApiEvent.MESSAGE_READ_INCOMING -> parseMessageReadIncoming(eventType, event)
             ApiEvent.MESSAGE_READ_OUTGOING -> parseMessageReadOutgoing(eventType, event)
+            ApiEvent.CHAT_CLEAR_FLAGS -> parseChatClearFlags(eventType, event)
+            ApiEvent.CHAT_SET_FLAGS -> parseChatSetFlags(eventType, event)
             ApiEvent.MESSAGES_DELETED -> parseMessagesDeleted(eventType, event)
-            ApiEvent.PIN_UNPIN_CONVERSATION -> parseConversationPinStateChanged(eventType, event)
+            ApiEvent.CHAT_MAJOR_CHANGED -> parseChatMajorChanged(eventType, event)
+            ApiEvent.CHAT_MINOR_CHANGED -> parseChatMinorChanged(eventType, event)
 
             ApiEvent.TYPING,
             ApiEvent.AUDIO_MESSAGE_RECORDING,
@@ -59,12 +71,460 @@ class LongPollUpdatesParser(
             ApiEvent.VIDEO_UPLOADING,
             ApiEvent.FILE_UPLOADING -> parseInteraction(eventType, event)
 
-            ApiEvent.UNREAD_COUNT_UPDATE -> onNewEvent(eventType, event)
+            ApiEvent.UNREAD_COUNT_UPDATE -> parseUnreadCounterUpdate(eventType, event)
+            ApiEvent.MESSAGE_UPDATED -> parseMessageUpdated(eventType, event)
+            ApiEvent.MESSAGE_CACHE_CLEAR -> parseMessageCacheClear(eventType, event)
         }
     }
 
-    private fun onNewEvent(eventType: ApiEvent, event: List<Any>) {
+    private fun parseMessageSetFlags(eventType: ApiEvent, event: List<Any>) {
-        Log.d("LongPollUpdatesParser", "newEvent: $eventType: $event")
+        Log.d("LongPollUpdatesParser", "$eventType: $event")
+
+        val cmId = event[1].asLong()
+        val flags = event[2].asInt()
+        val peerId = event[3].asLong()
+
+        val eventsToSend = mutableListOf<LongPollParsedEvent>()
+
+        val parsedFlags = MessageFlags.parse(flags)
+        parsedFlags.forEach { flag ->
+            when (flag) {
+                MessageFlags.IMPORTANT -> {
+                    val eventToSend = LongPollParsedEvent.MessageMarkedAsImportant(
+                        peerId = peerId,
+                        cmId = cmId,
+                        marked = true
+                    )
+                    eventsToSend += eventToSend
+
+                    listenersMap[LongPollEvent.MARKED_AS_IMPORTANT]?.let { listeners ->
+                        listeners.map { vkEventCallback ->
+                            (vkEventCallback as? VkEventCallback<LongPollParsedEvent.MessageMarkedAsImportant>)
+                                ?.onEvent(eventToSend)
+                        }
+                    }
+                }
+
+                MessageFlags.SPAM -> {
+                    val eventToSend = LongPollParsedEvent.MessageMarkedAsSpam(
+                        peerId = peerId,
+                        cmId = cmId
+                    )
+                    eventsToSend += eventToSend
+
+                    listenersMap[LongPollEvent.MARKED_AS_SPAM]?.let { listeners ->
+                        listeners.map { vkEventCallback ->
+                            (vkEventCallback as? VkEventCallback<LongPollParsedEvent.MessageMarkedAsSpam>)
+                                ?.onEvent(eventToSend)
+                        }
+                    }
+                }
+
+                MessageFlags.DELETED -> {
+                    val eventToSend =
+                        if (parsedFlags.contains(MessageFlags.DELETED_FOR_ALL)) {
+                            LongPollParsedEvent.MessageDeleted(
+                                peerId = peerId,
+                                cmId = cmId,
+                                forAll = true
+                            )
+                        } else {
+                            LongPollParsedEvent.MessageDeleted(
+                                peerId = peerId,
+                                cmId = cmId,
+                                forAll = false
+                            )
+                        }
+                    eventsToSend += eventToSend
+
+                    listenersMap[LongPollEvent.MESSAGE_DELETED]?.let { listeners ->
+                        listeners.map { vkEventCallback ->
+                            (vkEventCallback as? VkEventCallback<LongPollParsedEvent.MessageDeleted>)
+                                ?.onEvent(eventToSend)
+                        }
+                    }
+                }
+
+                MessageFlags.AUDIO_LISTENED -> {
+                    val eventToSend = LongPollParsedEvent.AudioMessageListened(
+                        peerId = peerId,
+                        cmId = cmId
+                    )
+                    eventsToSend += eventToSend
+
+                    listenersMap[LongPollEvent.AUDIO_MESSAGE_LISTENED]?.let { listeners ->
+                        listeners.map { vkEventCallback ->
+                            (vkEventCallback as? VkEventCallback<LongPollParsedEvent.AudioMessageListened>)
+                                ?.onEvent(eventToSend)
+                        }
+                    }
+                }
+
+                else -> Unit
+            }
+        }
+
+        eventsToSend.forEach { eventToSend ->
+            listenersMap[LongPollEvent.MESSAGE_SET_FLAGS]?.let { listeners ->
+                listeners.map { vkEventCallback ->
+                    (vkEventCallback as? VkEventCallback<LongPollParsedEvent>)?.onEvent(eventToSend)
+                }
+            }
+        }
+    }
+
+    private fun parseMessageClearFlags(eventType: ApiEvent, event: List<Any>) {
+        Log.d("LongPollUpdatesParser", "$eventType: $event")
+
+        val cmId = event[1].asLong()
+        val flags = event[2].asInt()
+        val peerId = event[3].asLong()
+
+        val eventsToSend = mutableListOf<LongPollParsedEvent>()
+
+        val parsedFlags = MessageFlags.parse(flags)
+
+        coroutineScope.launch {
+            parsedFlags.forEach { flag ->
+                when (flag) {
+                    MessageFlags.IMPORTANT -> {
+                        val eventToSend = LongPollParsedEvent.MessageMarkedAsImportant(
+                            peerId = peerId,
+                            cmId = cmId,
+                            marked = false
+                        )
+                        eventsToSend += eventToSend
+
+                        listenersMap[LongPollEvent.MARKED_AS_IMPORTANT]?.let { listeners ->
+                            listeners.map { vkEventCallback ->
+                                (vkEventCallback as? VkEventCallback<LongPollParsedEvent.MessageMarkedAsImportant>)
+                                    ?.onEvent(eventToSend)
+                            }
+                        }
+                    }
+
+                    MessageFlags.SPAM -> {
+                        if (parsedFlags.contains(MessageFlags.CANCEL_SPAM)) {
+                            withContext(Dispatchers.IO) {
+                                val message = loadMessage(
+                                    peerId = peerId,
+                                    cmId = cmId
+                                )
+                                message?.let {
+                                    val eventToSend =
+                                        LongPollParsedEvent.MessageMarkedAsNotSpam(message = message)
+                                    eventsToSend += eventToSend
+
+                                    listenersMap[LongPollEvent.MARKED_AS_NOT_SPAM]?.let { listeners ->
+                                        listeners.map { vkEventCallback ->
+                                            (vkEventCallback as? VkEventCallback<LongPollParsedEvent.MessageMarkedAsNotSpam>)
+                                                ?.onEvent(eventToSend)
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    MessageFlags.DELETED -> {
+                        withContext(Dispatchers.IO) {
+                            val message = loadMessage(
+                                peerId = peerId,
+                                cmId = cmId
+                            )
+                            message?.let {
+                                val eventToSend =
+                                    LongPollParsedEvent.MessageRestored(message = message)
+                                eventsToSend += eventToSend
+
+                                listenersMap[LongPollEvent.MESSAGE_RESTORED]?.let { listeners ->
+                                    listeners.map { vkEventCallback ->
+                                        (vkEventCallback as? VkEventCallback<LongPollParsedEvent.MessageRestored>)
+                                            ?.onEvent(eventToSend)
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    else -> Unit
+                }
+            }
+
+            eventsToSend.forEach { eventToSend ->
+                listenersMap[LongPollEvent.MESSAGE_CLEAR_FLAGS]?.let { listeners ->
+                    listeners.map { vkEventCallback ->
+                        vkEventCallback.onEvent(eventToSend)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun parseMessageNew(eventType: ApiEvent, event: List<Any>) {
+        Log.d("LongPollUpdatesParser", "$eventType: $event")
+
+        val cmId = event[1].asLong()
+        val peerId = event[4].asLong()
+
+        coroutineScope.launch(Dispatchers.IO) {
+            val message =
+                async { loadMessage(peerId = peerId, cmId = cmId) }.await()
+
+            val convo =
+                async {
+                    loadConvo(
+                        peerId = peerId,
+                        extended = true,
+                        fields = VkConstants.ALL_FIELDS
+                    )
+                }.await()
+
+            message?.let {
+                listenersMap[LongPollEvent.MESSAGE_NEW]?.let {
+                    it.map { vkEventCallback ->
+                        (vkEventCallback as VkEventCallback<LongPollParsedEvent.NewMessage>)
+                            .onEvent(
+                                LongPollParsedEvent.NewMessage(
+                                    message = message,
+                                    inArchive = convo?.isArchived == true
+                                    // TODO: 03-Apr-25, Danil Nikolaev:
+                                    // load user settings about restoring chats with
+                                    // enabled notifications from archive
+                                )
+                            )
+                    }
+                }
+            }
+        }
+    }
+
+    private fun parseMessageEdit(eventType: ApiEvent, event: List<Any>) {
+        Log.d("LongPollUpdatesParser", "$eventType: $event")
+
+        val cmId = event[1].asLong()
+        val peerId = event[3].asLong()
+
+        coroutineScope.launch(Dispatchers.IO) {
+            loadMessage(
+                peerId = peerId,
+                cmId = cmId
+            )?.let { message ->
+                listenersMap[LongPollEvent.MESSAGE_EDITED]?.let {
+                    it.map { vkEventCallback ->
+                        (vkEventCallback as VkEventCallback<LongPollParsedEvent.MessageEdited>)
+                            .onEvent(LongPollParsedEvent.MessageEdited(message))
+                    }
+                }
+            }
+        }
+    }
+
+    private fun parseMessageReadIncoming(eventType: ApiEvent, event: List<Any>) {
+        Log.d("LongPollUpdatesParser", "$eventType: $event")
+        val peerId = event[1].asLong()
+        val cmId = event[2].asLong()
+        val unreadCount = event[3].asInt()
+
+        listenersMap[LongPollEvent.INCOMING_MESSAGE_READ]?.let { listeners ->
+            listeners.map { vkEventCallback ->
+                (vkEventCallback as VkEventCallback<LongPollParsedEvent.IncomingMessageRead>)
+                    .onEvent(
+                        LongPollParsedEvent.IncomingMessageRead(
+                            peerId = peerId,
+                            cmId = cmId,
+                            unreadCount = unreadCount
+                        )
+                    )
+            }
+        }
+    }
+
+    private fun parseMessageReadOutgoing(eventType: ApiEvent, event: List<Any>) {
+        Log.d("LongPollUpdatesParser", "$eventType: $event")
+        val peerId = event[1].asLong()
+        val cmId = event[2].asLong()
+        val unreadCount = event[3].asInt()
+
+        listenersMap[LongPollEvent.OUTGOING_MESSAGE_READ]?.let { listeners ->
+            listeners.map { vkEventCallback ->
+                (vkEventCallback as VkEventCallback<LongPollParsedEvent.OutgoingMessageRead>)
+                    .onEvent(
+                        LongPollParsedEvent.OutgoingMessageRead(
+                            peerId = peerId,
+                            cmId = cmId,
+                            unreadCount = unreadCount
+                        )
+                    )
+            }
+        }
+    }
+
+    private fun parseChatClearFlags(eventType: ApiEvent, event: List<Any>) {
+        Log.d("LongPollUpdatesParser", "$eventType: $event")
+
+        val peerId = event[1].asLong()
+        val flags = event[2].asInt()
+
+        val eventsToSend = mutableListOf<LongPollParsedEvent>()
+
+        val parsedFlags = ConvoFlags.parse(flags)
+
+        coroutineScope.launch(Dispatchers.IO) {
+            parsedFlags.forEach { flag ->
+                when (flag) {
+                    ConvoFlags.ARCHIVED -> {
+                        val convo = loadConvo(
+                            peerId = peerId,
+                            extended = true,
+                            fields = VkConstants.ALL_FIELDS
+                        ) ?: return@forEach
+
+                        val message = loadMessage(
+                            peerId = peerId,
+                            cmId = convo.lastCmId
+                        )
+
+                        val eventToSend = LongPollParsedEvent.ChatArchived(
+                            convo = convo.copy(lastMessage = message),
+                            archived = false
+                        )
+                        eventsToSend += eventToSend
+
+                        listenersMap[LongPollEvent.CHAT_ARCHIVED]?.let { listeners ->
+                            listeners.map { vkEventCallback ->
+                                (vkEventCallback as? VkEventCallback<LongPollParsedEvent.ChatArchived>)
+                                    ?.onEvent(eventToSend)
+                            }
+                        }
+                    }
+
+                    else -> Unit
+                }
+            }
+
+            eventsToSend.forEach { eventToSend ->
+                listenersMap[LongPollEvent.CHAT_CLEAR_FLAGS]?.let { listeners ->
+                    listeners.map { vkEventCallback ->
+                        (vkEventCallback as? VkEventCallback<LongPollParsedEvent>)?.onEvent(
+                            eventToSend
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    private fun parseChatSetFlags(eventType: ApiEvent, event: List<Any>) {
+        Log.d("LongPollUpdatesParser", "$eventType: $event")
+
+        val peerId = event[1].asLong()
+        val flags = event[2].asInt()
+
+        val eventsToSend = mutableListOf<LongPollParsedEvent>()
+
+        val parsedFlags = ConvoFlags.parse(flags)
+
+        coroutineScope.launch(Dispatchers.IO) {
+            parsedFlags.forEach { flag ->
+                when (flag) {
+                    ConvoFlags.ARCHIVED -> {
+                        val convo = loadConvo(
+                            peerId = peerId,
+                            extended = true,
+                            fields = VkConstants.ALL_FIELDS
+                        ) ?: return@forEach
+
+                        val message = loadMessage(
+                            peerId = peerId,
+                            cmId = convo.lastCmId
+                        )
+
+                        val eventToSend = LongPollParsedEvent.ChatArchived(
+                            convo = convo.copy(lastMessage = message),
+                            archived = true
+                        )
+                        eventsToSend += eventToSend
+
+                        listenersMap[LongPollEvent.CHAT_ARCHIVED]?.let { listeners ->
+                            listeners.map { vkEventCallback ->
+                                (vkEventCallback as? VkEventCallback<LongPollParsedEvent.ChatArchived>)
+                                    ?.onEvent(eventToSend)
+                            }
+                        }
+                    }
+
+                    else -> Unit
+                }
+            }
+
+            eventsToSend.forEach { eventToSend ->
+                listenersMap[LongPollEvent.CHAT_SET_FLAGS]?.let { listeners ->
+                    listeners.map { vkEventCallback ->
+                        (vkEventCallback as? VkEventCallback<LongPollParsedEvent>)?.onEvent(
+                            eventToSend
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    private fun parseMessagesDeleted(eventType: ApiEvent, event: List<Any>) {
+        Log.d("LongPollUpdatesParser", "$eventType: $event")
+
+        val peerId = event[1].asLong()
+        val cmId = event[2].asLong()
+
+        listenersMap[LongPollEvent.CHAT_CLEARED]?.let { listeners ->
+            listeners.forEach { vkEventCallback ->
+                (vkEventCallback as VkEventCallback<LongPollParsedEvent.ChatCleared>)
+                    .onEvent(
+                        LongPollParsedEvent.ChatCleared(
+                            peerId = peerId,
+                            toCmId = cmId
+                        )
+                    )
+            }
+        }
+    }
+
+    private fun parseChatMajorChanged(eventType: ApiEvent, event: List<Any>) {
+        Log.d("LongPollUpdatesParser", "$eventType: $event")
+
+        val peerId = event[1].asLong()
+        val majorId = event[2].asInt()
+
+        listenersMap[LongPollEvent.CHAT_MAJOR_CHANGED]?.let { listeners ->
+            listeners.forEach { vkEventCallback ->
+                (vkEventCallback as VkEventCallback<LongPollParsedEvent.ChatMajorChanged>)
+                    .onEvent(
+                        LongPollParsedEvent.ChatMajorChanged(
+                            peerId = peerId,
+                            majorId = majorId,
+                        )
+                    )
+            }
+        }
+    }
+
+    private fun parseChatMinorChanged(eventType: ApiEvent, event: List<Any>) {
+        Log.d("LongPollUpdatesParser", "$eventType: $event")
+
+        val peerId = event[1].asLong()
+        val minorId = event[2].asInt()
+
+        listenersMap[LongPollEvent.CHAT_MINOR_CHANGED]?.let { listeners ->
+            listeners.forEach { vkEventCallback ->
+                (vkEventCallback as VkEventCallback<LongPollParsedEvent.ChatMinorChanged>)
+                    .onEvent(
+                        LongPollParsedEvent.ChatMinorChanged(
+                            peerId = peerId,
+                            minorId = minorId,
+                        )
+                    )
+            }
+        }
     }
 
     private fun parseInteraction(eventType: ApiEvent, event: List<Any>) {
@@ -79,20 +539,28 @@ class LongPollUpdatesParser(
             else -> return
         }
 
-        val peerId = event[1].asInt()
+        val longPollEvent: LongPollEvent = when (eventType) {
-        val userIds = event[2].toList(Any::asInt).filter { it != UserConfig.userId }
+            ApiEvent.TYPING -> LongPollEvent.TYPING
+            ApiEvent.AUDIO_MESSAGE_RECORDING -> LongPollEvent.AUDIO_MESSAGE_RECORDING
+            ApiEvent.PHOTO_UPLOADING -> LongPollEvent.PHOTO_UPLOADING
+            ApiEvent.VIDEO_UPLOADING -> LongPollEvent.VIDEO_UPLOADING
+            ApiEvent.FILE_UPLOADING -> LongPollEvent.FILE_UPLOADING
+            else -> return
+        }
+
+        val peerId = event[1].asLong()
+        val userIds = event[2].toList(Any::asLong).filter { it != UserConfig.userId }
         val totalCount = event[3].asInt()
         val timestamp = event[4].asInt()
 
         // if userIds contains only account's id, then we don't need to show our status
         if (userIds.isEmpty()) return
 
-        coroutineScope.launch {
+        listenersMap[longPollEvent]?.let { listeners ->
-            listenersMap[eventType]?.let { listeners ->
             listeners.forEach { vkEventCallback ->
-                    (vkEventCallback as VkEventCallback<LongPollEvent.Interaction>)
+                (vkEventCallback as VkEventCallback<LongPollParsedEvent.Interaction>)
                     .onEvent(
-                            LongPollEvent.Interaction(
+                        LongPollParsedEvent.Interaction(
                             interactionType = interactionType,
                             peerId = peerId,
                             userIds = userIds,
@@ -103,253 +571,237 @@ class LongPollUpdatesParser(
             }
         }
     }
-    }
 
-    private fun parseConversationPinStateChanged(eventType: ApiEvent, event: List<Any>) {
+    private fun parseUnreadCounterUpdate(eventType: ApiEvent, event: List<Any>) {
-        Log.d("LongPollUpdatesParser", "$eventType: $event")
+        Log.d("LongPollUpdatesParser", "$eventType $event")
 
-        val peerId = event[1].asInt()
+        val unreadCount = event[1].asInt()
-        val majorId = event[2].asInt()
+        val unreadUnmutedCount = event[2].asInt()
+        val showOnlyMuted = event[3].asInt() == 1
+        val businessNotifyUnreadCount = event[4].asInt()
+        val archiveUnreadCount = event[7].asInt()
+        val archiveUnreadUnmutedCount = event[8].asInt()
+        val archiveMentionsCount = event[9].asInt()
 
-        coroutineScope.launch {
+        listenersMap[LongPollEvent.UNREAD_COUNTER_UPDATE]?.let { listeners ->
-            listenersMap[ApiEvent.PIN_UNPIN_CONVERSATION]?.let { listeners ->
             listeners.forEach { vkEventCallback ->
-                    (vkEventCallback as VkEventCallback<LongPollEvent.VkConversationPinStateChangedEvent>)
+                (vkEventCallback as VkEventCallback<LongPollParsedEvent.UnreadCounter>)
                     .onEvent(
-                            LongPollEvent.VkConversationPinStateChangedEvent(
+                        LongPollParsedEvent.UnreadCounter(
-                                peerId = peerId,
+                            unread = unreadCount,
-                                majorId = majorId
+                            unreadUnmuted = unreadUnmutedCount,
+                            showOnlyMuted = showOnlyMuted,
+                            business = businessNotifyUnreadCount,
+                            archive = archiveUnreadCount,
+                            archiveUnmuted = archiveUnreadUnmutedCount,
+                            archiveMentions = archiveMentionsCount
                         )
                     )
             }
         }
     }
-    }
 
-    private fun parseMessageSetFlags(eventType: ApiEvent, event: List<Any>) {
+    private fun parseMessageUpdated(eventType: ApiEvent, event: List<Any>) {
-        Log.d("LongPollUpdatesParser", "$eventType: $event")
+        Log.d("LongPollUpdatesParser", "$eventType $event")
-    }
 
-    private fun parseMessageClearFlags(eventType: ApiEvent, event: List<Any>) {
+        val cmId = event[1].asLong()
-        Log.d("LongPollUpdatesParser", "$eventType: $event")
+        val peerId = event[4].asLong()
-    }
-
-    private fun parseMessageNew(eventType: ApiEvent, event: List<Any>) {
-        Log.d("LongPollUpdatesParser", "$eventType: $event")
-        val messageId = event[1].asInt()
 
         coroutineScope.launch(Dispatchers.IO) {
-            val newMessageEvent: LongPollEvent.VkMessageNewEvent? =
+            loadMessage(
-                loadNormalMessage(
-                    eventType,
-                    messageId
-                )
-
-            newMessageEvent?.let { event ->
-                listenersMap[ApiEvent.MESSAGE_NEW]?.let {
-                    it.map { vkEventCallback ->
-                        (vkEventCallback as VkEventCallback<LongPollEvent.VkMessageNewEvent>)
-                            .onEvent(event)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun parseMessageEdit(eventType: ApiEvent, event: List<Any>) {
-        Log.d("LongPollUpdatesParser", "$eventType: $event")
-        val messageId = event[1].asInt()
-
-        coroutineScope.launch {
-            val editedMessageEvent: LongPollEvent.VkMessageEditEvent? =
-                loadNormalMessage(
-                    eventType,
-                    messageId
-                )
-
-            editedMessageEvent?.let { event ->
-                listenersMap[ApiEvent.MESSAGE_EDIT]?.let {
-                    it.map { vkEventCallback ->
-                        (vkEventCallback as VkEventCallback<LongPollEvent.VkMessageEditEvent>)
-                            .onEvent(event)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun parseMessageReadIncoming(eventType: ApiEvent, event: List<Any>) {
-        Log.d("LongPollUpdatesParser", "$eventType: $event")
-        val peerId = event[1].asInt()
-        val messageId = event[2].asInt()
-        val unreadCount = event[3].asInt()
-
-        coroutineScope.launch {
-            listenersMap[ApiEvent.MESSAGE_READ_INCOMING]?.let { listeners ->
-                listeners.map { vkEventCallback ->
-                    (vkEventCallback as VkEventCallback<LongPollEvent.VkMessageReadIncomingEvent>)
-                        .onEvent(
-                            LongPollEvent.VkMessageReadIncomingEvent(
                 peerId = peerId,
-                                messageId = messageId,
+                cmId = cmId
-                                unreadCount = unreadCount
+            )?.let { message ->
-                            )
+                listenersMap[LongPollEvent.MESSAGE_UPDATED]?.let {
-                        )
+                    it.map { vkEventCallback ->
+                        (vkEventCallback as VkEventCallback<LongPollParsedEvent.MessageUpdated>)
+                            .onEvent(LongPollParsedEvent.MessageUpdated(message))
+                    }
                 }
             }
         }
     }
 
-    private fun parseMessageReadOutgoing(eventType: ApiEvent, event: List<Any>) {
+    private fun parseMessageCacheClear(eventType: ApiEvent, event: List<Any>) {
-        Log.d("LongPollUpdatesParser", "$eventType: $event")
+        Log.d("LongPollUpdatesParser", "$eventType $event")
-        val peerId = event[1].asInt()
-        val messageId = event[2].asInt()
-        val unreadCount = event[3].asInt()
 
-        coroutineScope.launch {
+        val messageId = event[1].asLong()
-            listenersMap[ApiEvent.MESSAGE_READ_OUTGOING]?.let { listeners ->
+
-                listeners.map { vkEventCallback ->
+        coroutineScope.launch(Dispatchers.IO) {
-                    (vkEventCallback as VkEventCallback<LongPollEvent.VkMessageReadOutgoingEvent>)
+            loadMessage(messageId = messageId)?.let { message ->
-                        .onEvent(
+                listenersMap[LongPollEvent.MESSAGE_CACHE_CLEAR]?.let {
-                            LongPollEvent.VkMessageReadOutgoingEvent(
+                    it.map { vkEventCallback ->
-                                peerId = peerId,
+                        (vkEventCallback as VkEventCallback<LongPollParsedEvent.MessageCacheClear>)
-                                messageId = messageId,
+                            .onEvent(LongPollParsedEvent.MessageCacheClear(message))
-                                unreadCount = unreadCount
+                    }
-                            )
-                        )
                 }
             }
         }
     }
 
-    private fun parseMessagesDeleted(eventType: ApiEvent, event: List<Any>) {
+    private suspend fun loadMessage(
-        Log.d("LongPollUpdatesParser", "$eventType: $event")
+        peerId: Long? = null,
-    }
+        cmId: Long? = null,
+        messageId: Long? = null
+    ): VkMessage? = suspendCoroutine { continuation ->
+        require((peerId != null && cmId != null) || messageId != null)
 
-    private suspend inline fun <reified T : LongPollEvent> loadNormalMessage(
-        eventType: ApiEvent,
-        messageId: Int
-    ): T? = suspendCoroutine { continuation ->
         coroutineScope.launch(Dispatchers.IO) {
             messagesUseCase.getById(
-                messageIds = listOf(messageId),
+                peerCmIds = null,
+                peerId = peerId,
+                messageIds = messageId?.let(::listOf),
+                cmIds = cmId?.let(::listOf),
                 extended = true,
                 fields = VkConstants.ALL_FIELDS
             ).listenValue(this) { state ->
                 state.processState(
                     error = { error ->
-                        Log.e("LongPollUpdatesParser", "loadNormalMessage: error: $error")
+                        Log.e("LongPollUpdatesParser", "loadMessage: error: $error")
+                        continuation.resume(null)
                     },
-                    success = { messages ->
+                    success = { response ->
-                        val message = messages.singleOrNull() ?: run {
+                        val message = response.singleOrNull() ?: run {
                             continuation.resume(null)
                             return@listenValue
                         }
 
-                        VkMemoryCache[message.id] = message
+                        continuation.resume(message)
-                        messagesUseCase.storeMessage(message)
-
-                        val resumeValue: LongPollEvent? = when (eventType) {
-                            ApiEvent.MESSAGE_NEW -> LongPollEvent.VkMessageNewEvent(message)
-                            ApiEvent.MESSAGE_EDIT -> LongPollEvent.VkMessageEditEvent(message)
-
-                            else -> {
-                                continuation.resume(null)
-                                null
-                            }
-                        }
-
-                        resumeValue?.let { value -> continuation.resume(value as T) }
                     }
                 )
             }
         }
     }
 
-    private fun <T : Any> registerListener(
+    private suspend fun loadConvo(
-        eventType: ApiEvent,
+        peerId: Long,
-        listener: VkEventCallback<T>
+        extended: Boolean = false,
-    ) {
+        fields: String? = null
-        listenersMap.let { map ->
+    ): VkConvo? = suspendCoroutine { continuation ->
-            map[eventType] = (map[eventType] ?: mutableListOf()).also { it.add(listener) }
+        coroutineScope.launch(Dispatchers.IO) {
+            convoUseCase.getById(
+                peerIds = listOf(peerId),
+                extended = extended,
+                fields = fields
+            ).listenValue(coroutineScope) { state ->
+                state.processState(
+                    error = { error ->
+                        Log.e("LongPollUpdatesParser", "loadConvo: error: $error")
+                        continuation.resume(null)
+                    },
+                    success = { response ->
+                        val convo = response.singleOrNull() ?: run {
+                            continuation.resume(null)
+                            return@listenValue
+                        }
+
+                        continuation.resume(convo)
+                    }
+                )
+            }
         }
     }
 
-    private fun <T : Any> registerListeners(
+    @Suppress("UNCHECKED_CAST")
-        eventTypes: List<ApiEvent>,
+    private fun <T : LongPollParsedEvent> registerListener(
+        eventType: LongPollEvent,
+        listener: VkEventCallback<T>
+    ) {
+        listenersMap.let { map ->
+            map[eventType] = (map[eventType] ?: mutableListOf())
+                .also {
+                    it.add(listener as VkEventCallback<LongPollParsedEvent>)
+                }
+        }
+    }
+
+    private fun <T : LongPollParsedEvent> registerListeners(
+        eventTypes: List<LongPollEvent>,
         listener: VkEventCallback<T>
     ) {
         eventTypes.forEach { eventType -> registerListener(eventType, listener) }
     }
 
-    fun onConversationPinStateChanged(listener: VkEventCallback<LongPollEvent.VkConversationPinStateChangedEvent>) {
+    fun onMessageSetFlags(block: (LongPollParsedEvent) -> Unit) {
-        registerListener(ApiEvent.PIN_UNPIN_CONVERSATION, listener)
+        registerListener(LongPollEvent.MESSAGE_SET_FLAGS, assembleEventCallback(block))
     }
 
-    fun onConversationPinStateChanged(block: (LongPollEvent.VkConversationPinStateChangedEvent) -> Unit) {
+    fun onMessageMarkedAsImportant(block: (LongPollParsedEvent.MessageMarkedAsImportant) -> Unit) {
-        onConversationPinStateChanged(assembleEventCallback(block))
+        registerListener(LongPollEvent.MARKED_AS_IMPORTANT, assembleEventCallback(block))
     }
 
-    fun onMessageIncomingRead(listener: VkEventCallback<LongPollEvent.VkMessageReadIncomingEvent>) {
+    fun onMessageMarkedAsSpam(block: (LongPollParsedEvent.MessageMarkedAsSpam) -> Unit) {
-        registerListener(ApiEvent.MESSAGE_READ_INCOMING, listener)
+        registerListener(LongPollEvent.MARKED_AS_SPAM, assembleEventCallback(block))
     }
 
-    fun onMessageIncomingRead(block: (LongPollEvent.VkMessageReadIncomingEvent) -> Unit) {
+    fun onMessageDeleted(block: (LongPollParsedEvent.MessageDeleted) -> Unit) {
-        onMessageIncomingRead(assembleEventCallback(block))
+        registerListener(LongPollEvent.MESSAGE_DELETED, assembleEventCallback(block))
     }
 
-    fun onMessageOutgoingRead(listener: VkEventCallback<LongPollEvent.VkMessageReadOutgoingEvent>) {
+    fun onMessageClearFlags(block: (LongPollParsedEvent) -> Unit) {
-        registerListener(ApiEvent.MESSAGE_READ_OUTGOING, listener)
+        registerListener(LongPollEvent.MESSAGE_CLEAR_FLAGS, assembleEventCallback(block))
     }
 
-    fun onMessageOutgoingRead(block: (LongPollEvent.VkMessageReadOutgoingEvent) -> Unit) {
+    fun onMessageMarkedAsNotSpam(block: (LongPollParsedEvent.MessageMarkedAsNotSpam) -> Unit) {
-        onMessageOutgoingRead(assembleEventCallback(block))
+        registerListener(LongPollEvent.MARKED_AS_NOT_SPAM, assembleEventCallback(block))
     }
 
-    fun onNewMessage(listener: VkEventCallback<LongPollEvent.VkMessageNewEvent>) {
+    fun onMessageRestored(block: (LongPollParsedEvent.MessageRestored) -> Unit) {
-        registerListener(ApiEvent.MESSAGE_NEW, listener)
+        registerListener(LongPollEvent.MESSAGE_RESTORED, assembleEventCallback(block))
     }
 
-    fun onNewMessage(block: (LongPollEvent.VkMessageNewEvent) -> Unit) {
+    fun onNewMessage(block: (LongPollParsedEvent.NewMessage) -> Unit) {
-        onNewMessage(assembleEventCallback(block))
+        registerListener(LongPollEvent.MESSAGE_NEW, assembleEventCallback(block))
     }
 
-    fun onMessageEdited(listener: VkEventCallback<LongPollEvent.VkMessageEditEvent>) {
+    fun onMessageEdited(block: (LongPollParsedEvent.MessageEdited) -> Unit) {
-        registerListener(ApiEvent.MESSAGE_EDIT, listener)
+        registerListener(LongPollEvent.MESSAGE_EDITED, assembleEventCallback(block))
     }
 
-    fun onMessageEdited(block: (LongPollEvent.VkMessageEditEvent) -> Unit) {
+    fun onMessageIncomingRead(block: (LongPollParsedEvent.IncomingMessageRead) -> Unit) {
-        onMessageEdited(assembleEventCallback(block))
+        registerListener(LongPollEvent.INCOMING_MESSAGE_READ, assembleEventCallback(block))
     }
 
-    fun onInteractions(listener: VkEventCallback<LongPollEvent.Interaction>) {
+    fun onMessageOutgoingRead(block: (LongPollParsedEvent.OutgoingMessageRead) -> Unit) {
+        registerListener(LongPollEvent.OUTGOING_MESSAGE_READ, assembleEventCallback(block))
+    }
+
+    fun onChatCleared(block: (LongPollParsedEvent.ChatCleared) -> Unit) {
+        registerListener(LongPollEvent.CHAT_CLEARED, assembleEventCallback(block))
+    }
+
+    fun onChatMajorChanged(block: (LongPollParsedEvent.ChatMajorChanged) -> Unit) {
+        registerListener(LongPollEvent.CHAT_MAJOR_CHANGED, assembleEventCallback(block))
+    }
+
+    fun onChatMinorChanged(block: (LongPollParsedEvent.ChatMinorChanged) -> Unit) {
+        registerListener(LongPollEvent.CHAT_MINOR_CHANGED, assembleEventCallback(block))
+    }
+
+    fun onChatArchived(block: (LongPollParsedEvent.ChatArchived) -> Unit) {
+        registerListener(LongPollEvent.CHAT_ARCHIVED, assembleEventCallback(block))
+    }
+
+    fun onInteractions(block: (LongPollParsedEvent.Interaction) -> Unit) {
         registerListeners(
             eventTypes = listOf(
-                ApiEvent.TYPING,
+                LongPollEvent.TYPING,
-                ApiEvent.AUDIO_MESSAGE_RECORDING,
+                LongPollEvent.AUDIO_MESSAGE_RECORDING,
-                ApiEvent.PHOTO_UPLOADING,
+                LongPollEvent.PHOTO_UPLOADING,
-                ApiEvent.VIDEO_UPLOADING,
+                LongPollEvent.VIDEO_UPLOADING,
-                ApiEvent.FILE_UPLOADING
+                LongPollEvent.FILE_UPLOADING
             ),
-            listener = listener
+            listener = assembleEventCallback(block)
         )
     }
-
-    fun onInteractions(block: (LongPollEvent.Interaction) -> Unit) {
-        onInteractions(assembleEventCallback(block))
-    }
-
-    fun clearListeners() {
-        listenersMap.clear()
-    }
 }
 
-internal inline fun <R : Any> assembleEventCallback(
+internal inline fun <R : LongPollParsedEvent> assembleEventCallback(
     crossinline block: (R) -> Unit,
 ): VkEventCallback<R> {
     return VkEventCallback { event -> block.invoke(event) }
 }
 
-fun interface VkEventCallback<in T : Any> {
+fun interface VkEventCallback<in T : LongPollParsedEvent> {
     fun onEvent(event: T)
 }

core/domain/src/main/kotlin/dev/meloda/fast/domain/MessagesUseCase.kt

@@ -5,48 +5,78 @@ import dev.meloda.fast.data.api.messages.MessagesHistoryInfo
 import dev.meloda.fast.model.api.domain.VkAttachment
 import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage
 import dev.meloda.fast.model.api.domain.VkMessage
+import dev.meloda.fast.model.api.responses.MessagesSendResponse
 import kotlinx.coroutines.flow.Flow
 
-interface MessagesUseCase {
+interface MessagesUseCase : BaseUseCase {
+
+    suspend fun storeMessage(message: VkMessage)
+    suspend fun storeMessages(messages: List<VkMessage>)
 
     fun getMessagesHistory(
-        conversationId: Int,
+        convoId: Long,
         count: Int?,
         offset: Int?
     ): Flow<State<MessagesHistoryInfo>>
 
     fun getById(
-        messageIds: List<Int>,
+        peerCmIds: List<Long>?,
+        peerId: Long?,
+        messageIds: List<Long>?,
+        cmIds: List<Long>?,
         extended: Boolean?,
         fields: String?
     ): Flow<State<List<VkMessage>>>
 
     fun sendMessage(
-        peerId: Int,
+        peerId: Long,
-        randomId: Int,
+        randomId: Long,
         message: String?,
-        replyTo: Int?,
+        forward: String?,
-        attachments: List<VkAttachment>?
+        attachments: List<VkAttachment>?,
-    ): Flow<State<Int>>
+        formatData: VkMessage.FormatData?
+    ): Flow<State<MessagesSendResponse>>
 
     fun markAsRead(
-        peerId: Int,
+        peerId: Long,
-        startMessageId: Int
+        startMessageId: Long
     ): Flow<State<Int>>
 
     fun getHistoryAttachments(
-        peerId: Int,
+        peerId: Long,
-        count: Int?,
+        count: Int? = null,
-        offset: Int?,
+        offset: Int? = null,
         attachmentTypes: List<String>,
-        conversationMessageId: Int
+        cmId: Long
     ): Flow<State<List<VkAttachmentHistoryMessage>>>
 
     fun createChat(
-        userIds: List<Int>?,
+        userIds: List<Long>? = null,
-        title: String?
+        title: String
+    ): Flow<State<Long>>
+
+    fun pin(
+        peerId: Long,
+        messageId: Long? = null,
+        cmId: Long? = null
+    ): Flow<State<VkMessage>>
+
+    fun unpin(
+        peerId: Long
     ): Flow<State<Int>>
 
-    suspend fun storeMessage(message: VkMessage)
+    fun markAsImportant(
-    suspend fun storeMessages(messages: List<VkMessage>)
+        peerId: Long,
+        messageIds: List<Long>? = null,
+        cmIds: List<Long>? = null,
+        important: Boolean
+    ): Flow<State<List<Long>>>
+
+    fun delete(
+        peerId: Long,
+        messageIds: List<Long>? = null,
+        cmIds: List<Long>? = null,
+        spam: Boolean = false,
+        deleteForAll: Boolean = false
+    ): Flow<State<List<Any>>>
 }

core/domain/src/main/kotlin/dev/meloda/fast/domain/MessagesUseCaseImpl.kt

@@ -7,107 +7,13 @@ import dev.meloda.fast.data.mapToState
 import dev.meloda.fast.model.api.domain.VkAttachment
 import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage
 import dev.meloda.fast.model.api.domain.VkMessage
+import dev.meloda.fast.model.api.responses.MessagesSendResponse
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
 
 class MessagesUseCaseImpl(
-    private val repository: MessagesRepository
+    private val repository: MessagesRepository,
 ) : MessagesUseCase {
 
-    override fun getMessagesHistory(
-        conversationId: Int,
-        count: Int?,
-        offset: Int?
-    ): Flow<State<MessagesHistoryInfo>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.getHistory(
-            conversationId = conversationId,
-            offset = offset,
-            count = count
-        ).mapToState()
-
-        emit(newState)
-    }
-
-    override fun getById(
-        messageIds: List<Int>,
-        extended: Boolean?,
-        fields: String?
-    ): Flow<State<List<VkMessage>>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.getById(
-            messagesIds = messageIds,
-            extended = extended,
-            fields = fields
-        ).mapToState()
-
-        emit(newState)
-    }
-
-    override fun sendMessage(
-        peerId: Int,
-        randomId: Int,
-        message: String?,
-        replyTo: Int?,
-        attachments: List<VkAttachment>?
-    ): Flow<State<Int>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.send(
-            peerId = peerId,
-            randomId = randomId,
-            message = message,
-            replyTo = replyTo,
-            attachments = attachments
-        ).mapToState()
-
-        emit(newState)
-    }
-
-    override fun markAsRead(
-        peerId: Int,
-        startMessageId: Int
-    ): Flow<State<Int>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.markAsRead(
-            peerId = peerId,
-            startMessageId = startMessageId
-        ).mapToState()
-
-        emit(newState)
-    }
-
-    override fun getHistoryAttachments(
-        peerId: Int,
-        count: Int?,
-        offset: Int?,
-        attachmentTypes: List<String>,
-        conversationMessageId: Int
-    ): Flow<State<List<VkAttachmentHistoryMessage>>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.getHistoryAttachments(
-            peerId = peerId,
-            count = count,
-            offset = offset,
-            attachmentTypes = attachmentTypes,
-            conversationMessageId = conversationMessageId
-        ).mapToState()
-
-        emit(newState)
-    }
-
-    override fun createChat(userIds: List<Int>?, title: String?): Flow<State<Int>> = flow {
-        emit(State.Loading)
-
-        val newState = repository.createChat(userIds, title).mapToState()
-
-        emit(newState)
-    }
-
     override suspend fun storeMessage(message: VkMessage) {
         repository.storeMessages(listOf(message))
     }
@@ -115,4 +21,131 @@ class MessagesUseCaseImpl(
     override suspend fun storeMessages(messages: List<VkMessage>) {
         repository.storeMessages(messages)
     }
+
+    override fun getMessagesHistory(
+        convoId: Long,
+        count: Int?,
+        offset: Int?
+    ): Flow<State<MessagesHistoryInfo>> = flowNewState {
+        repository.getHistory(
+            convoId = convoId,
+            offset = offset,
+            count = count
+        ).mapToState()
+    }
+
+    override fun getById(
+        peerCmIds: List<Long>?,
+        peerId: Long?,
+        messageIds: List<Long>?,
+        cmIds: List<Long>?,
+        extended: Boolean?,
+        fields: String?
+    ): Flow<State<List<VkMessage>>> = flowNewState {
+        repository.getById(
+            peerCmIds = peerCmIds,
+            peerId = peerId,
+            messagesIds = messageIds,
+            cmIds = cmIds,
+            extended = extended,
+            fields = fields
+        ).mapToState()
+    }
+
+    override fun sendMessage(
+        peerId: Long,
+        randomId: Long,
+        message: String?,
+        forward: String?,
+        attachments: List<VkAttachment>?,
+        formatData: VkMessage.FormatData?
+    ): Flow<State<MessagesSendResponse>> = flowNewState {
+        repository.send(
+            peerId = peerId,
+            randomId = randomId,
+            message = message,
+            forward = forward,
+            attachments = attachments,
+            formatData = formatData
+        ).mapToState()
+    }
+
+    override fun markAsRead(
+        peerId: Long,
+        startMessageId: Long
+    ): Flow<State<Int>> = flowNewState {
+        repository.markAsRead(
+            peerId = peerId,
+            startMessageId = startMessageId
+        ).mapToState()
+    }
+
+    override fun getHistoryAttachments(
+        peerId: Long,
+        count: Int?,
+        offset: Int?,
+        attachmentTypes: List<String>,
+        cmId: Long
+    ): Flow<State<List<VkAttachmentHistoryMessage>>> = flowNewState {
+        repository.getHistoryAttachments(
+            peerId = peerId,
+            count = count,
+            offset = offset,
+            attachmentTypes = attachmentTypes,
+            cmId = cmId
+        ).mapToState()
+    }
+
+    override fun createChat(
+        userIds: List<Long>?,
+        title: String
+    ): Flow<State<Long>> = flowNewState {
+        repository.createChat(userIds, title).mapToState()
+    }
+
+    override fun pin(
+        peerId: Long,
+        messageId: Long?,
+        cmId: Long?
+    ): Flow<State<VkMessage>> = flowNewState {
+        repository.pin(
+            peerId = peerId,
+            messageId = messageId,
+            cmId = cmId
+        ).mapToState()
+    }
+
+    override fun unpin(peerId: Long): Flow<State<Int>> = flowNewState {
+        repository.unpin(peerId = peerId).mapToState()
+    }
+
+    override fun markAsImportant(
+        peerId: Long,
+        messageIds: List<Long>?,
+        cmIds: List<Long>?,
+        important: Boolean
+    ): Flow<State<List<Long>>> = flowNewState {
+        repository.markAsImportant(
+            peerId = peerId,
+            messageIds = messageIds,
+            cmIds = cmIds,
+            important = important
+        ).mapToState()
+    }
+
+    override fun delete(
+        peerId: Long,
+        messageIds: List<Long>?,
+        cmIds: List<Long>?,
+        spam: Boolean,
+        deleteForAll: Boolean
+    ): Flow<State<List<Any>>> = flowNewState {
+        repository.delete(
+            peerId = peerId,
+            messageIds = messageIds,
+            cmIds = cmIds,
+            spam = spam,
+            deleteForAll = deleteForAll
+        ).mapToState()
+    }
 }

core/domain/src/main/kotlin/dev/meloda/fast/domain/OAuthUseCase.kt

@@ -2,6 +2,7 @@ package dev.meloda.fast.domain
 
 import dev.meloda.fast.data.State
 import dev.meloda.fast.model.AuthInfo
+import dev.meloda.fast.model.api.responses.GetSilentTokenResponse
 import kotlinx.coroutines.flow.Flow
 
 interface OAuthUseCase {
@@ -14,4 +15,14 @@ interface OAuthUseCase {
         captchaSid: String?,
         captchaKey: String?
     ): Flow<State<AuthInfo>>
+
+    fun getSilentToken(
+        login: String,
+        password: String,
+        forceSms: Boolean,
+        validationCode: String?,
+        captchaSid: String? = null,
+        captchaKey: String? = null,
+        successToken: String? = null
+    ): Flow<State<GetSilentTokenResponse>>
 }

core/domain/src/main/kotlin/dev/meloda/fast/domain/OAuthUseCaseImpl.kt

@@ -2,11 +2,9 @@ package dev.meloda.fast.domain
 
 import dev.meloda.fast.data.State
 import dev.meloda.fast.data.api.oauth.OAuthRepository
+import dev.meloda.fast.data.asState
 import dev.meloda.fast.model.AuthInfo
-import dev.meloda.fast.network.OAuthErrorDomain
+import dev.meloda.fast.model.api.responses.GetSilentTokenResponse
-import dev.meloda.fast.network.ValidationType
-import dev.meloda.fast.network.VkOAuthError
-import dev.meloda.fast.network.VkOAuthErrorType
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 
@@ -24,109 +22,47 @@ class OAuthUseCaseImpl(
     ): Flow<State<AuthInfo>> = flow {
         emit(State.Loading)
 
-        val response = oAuthRepository.auth(
+        val newState = oAuthRepository.auth(
             login = login,
             password = password,
+            forceSms = forceSms,
+            validationCode = validationCode,
+            captchaSid = captchaSid,
+            captchaKey = captchaKey
+        ).asState(
+            successMapper = {
+                AuthInfo(
+                    userId = it.userId!!,
+                    accessToken = it.accessToken!!,
+                    validationHash = it.validationHash!!
+                )
+            }
+        )
+
+        emit(newState)
+    }
+
+    override fun getSilentToken(
+        login: String,
+        password: String,
+        forceSms: Boolean,
+        validationCode: String?,
+        captchaSid: String?,
+        captchaKey: String?,
+        successToken: String?
+    ): Flow<State<GetSilentTokenResponse>> = flow {
+        emit(State.Loading)
+
+        val newState = oAuthRepository.getSilentToken(
+            login = login,
+            password = password,
+            forceSms = forceSms,
             validationCode = validationCode,
             captchaSid = captchaSid,
             captchaKey = captchaKey,
-            forceSms = forceSms
+            successToken = successToken
-        )
+        ).asState()
-
-        kotlin.runCatching {
-            val error = response.error?.let(VkOAuthError::parse)
-            val errorType = response.errorType?.let(VkOAuthErrorType::parse)
-
-            val newState = when (error) {
-                null -> {
-                    State.Success(
-                        AuthInfo(
-                            userId = response.userId,
-                            accessToken = response.accessToken,
-                            validationHash = response.validationHash
-                        )
-                    )
-                }
-
-                VkOAuthError.FLOOD_CONTROL -> {
-                    State.Error.OAuthError(OAuthErrorDomain.TooManyTriesError)
-                }
-
-                VkOAuthError.NEED_VALIDATION -> {
-                    if (response.banInfo != null) {
-                        val info = requireNotNull(response.banInfo)
-
-                        State.Error.OAuthError(
-                            OAuthErrorDomain.UserBannedError(
-                                memberName = info.memberName,
-                                message = info.message,
-                                accessToken = info.accessToken,
-                                restoreUrl = info.restoreUrl
-                            )
-                        )
-                    } else {
-                        State.Error.OAuthError(
-                            OAuthErrorDomain.ValidationRequiredError(
-                                description = response.errorDescription.orEmpty(),
-                                validationType = response.validationType.orEmpty()
-                                    .let(ValidationType::parse),
-                                validationSid = response.validationSid.orEmpty(),
-                                phoneMask = response.phoneMask.orEmpty(),
-                                redirectUri = response.redirectUri.orEmpty(),
-                                validationResend = response.validationResend,
-                                restoreIfCannotGetCode = response.restoreIfCannotGetCode
-                            )
-                        )
-                    }
-                }
-
-                VkOAuthError.NEED_CAPTCHA -> {
-                    State.Error.OAuthError(
-                        OAuthErrorDomain.CaptchaRequiredError(
-                            captchaSid = response.captchaSid.orEmpty(),
-                            captchaImageUrl = response.captchaImage.orEmpty()
-                        )
-                    )
-                }
-
-                VkOAuthError.INVALID_CLIENT -> {
-                    State.Error.OAuthError(OAuthErrorDomain.InvalidCredentialsError)
-                }
-
-                VkOAuthError.INVALID_REQUEST -> {
-                    when (errorType) {
-                        null -> State.Error.OAuthError(OAuthErrorDomain.UnknownError)
-
-                        VkOAuthErrorType.WRONG_OTP -> {
-                            State.Error.OAuthError(OAuthErrorDomain.WrongValidationCode)
-                        }
-
-                        VkOAuthErrorType.WRONG_OTP_FORMAT -> {
-                            State.Error.OAuthError(OAuthErrorDomain.WrongValidationCodeFormat)
-                        }
-
-                        VkOAuthErrorType.PASSWORD_BRUTEFORCE_ATTEMPT -> {
-                            State.Error.OAuthError(OAuthErrorDomain.TooManyTriesError)
-                        }
-
-                        VkOAuthErrorType.USERNAME_OR_PASSWORD_IS_INCORRECT -> {
-                            State.Error.OAuthError(OAuthErrorDomain.InvalidCredentialsError)
-                        }
-                    }
-                }
-
-                VkOAuthError.UNKNOWN -> {
-                    State.Error.OAuthError(OAuthErrorDomain.UnknownError)
-                }
-            }
 
         emit(newState)
-        }.fold(
-            onSuccess = {
-            },
-            onFailure = {
-                emit(State.Error.TestError(it.stackTraceToString()))
-            }
-        )
     }
 }

core/domain/src/main/kotlin/dev/meloda/fast/domain/di/DomainModule.kt

@@ -6,7 +6,8 @@ import dev.meloda.fast.domain.AccountUseCaseImpl
 import dev.meloda.fast.domain.GetCurrentAccountUseCase
 import dev.meloda.fast.domain.GetLocalUserByIdUseCase
 import dev.meloda.fast.domain.GetLocalUsersByIdsUseCase
-import dev.meloda.fast.domain.LoadConversationsByIdUseCase
+import dev.meloda.fast.domain.GetMessageReadPeersUseCase
+import dev.meloda.fast.domain.LoadConvosByIdUseCase
 import dev.meloda.fast.domain.LoadUserByIdUseCase
 import dev.meloda.fast.domain.LoadUsersByIdsUseCase
 import dev.meloda.fast.domain.StoreUsersUseCase
@@ -26,5 +27,7 @@ val domainModule = module {
     singleOf(::AccountUseCaseImpl) bind AccountUseCase::class
     singleOf(::GetCurrentAccountUseCase)
 
-    singleOf(::LoadConversationsByIdUseCase)
+    singleOf(::LoadConvosByIdUseCase)
+
+    singleOf(::GetMessageReadPeersUseCase)
 }