Added log out

Author: veselovvv

app/src/main/java/com/veselovvv/androidchatclient/data/user/UserRepository.kt

@@ -10,6 +10,7 @@ interface UserRepository {
     ): UsersData
     fun getUserId(): String //TODO dry here and in chat with messages
     fun getUserToken(): String //TODO dry here and in chat with messages
+    fun cleanToken()
 
     class Base(
         private val cloudDataSource: UserCloudDataSource,
@@ -51,5 +52,6 @@ interface UserRepository {
 
         override fun getUserId() = sessionManager.read().second
         override fun getUserToken() = sessionManager.read().first
+        override fun cleanToken() = sessionManager.save(Pair(getUserId(), ""))
     }
 }

app/src/main/java/com/veselovvv/androidchatclient/domain/user/UserInteractor.kt

@@ -13,6 +13,7 @@ interface UserInteractor {
     ): UsersDomain
     fun getUserId(): String
     fun getUserToken(): String
+    fun cleanToken()
 
     class Base(
         private val userRepository: UserRepository,
@@ -30,5 +31,6 @@ interface UserInteractor {
 
         override fun getUserId() = userRepository.getUserId()
         override fun getUserToken() = userRepository.getUserToken()
+        override fun cleanToken() = userRepository.cleanToken()
     }
 }

app/src/main/java/com/veselovvv/androidchatclient/ui/chats/ChatsFragment.kt

@@ -93,7 +93,6 @@ class ChatsFragment : Fragment() {
                     true
                 }
                 R.id.action_settings -> {
-                    //TODO
                     viewModel.showSettings()
                     drawerLayout.close()
                     true

app/src/main/java/com/veselovvv/androidchatclient/ui/user/SettingsFragment.kt

@@ -1,5 +1,6 @@
 package com.veselovvv.androidchatclient.ui.user
 
+import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -19,6 +20,7 @@ import com.veselovvv.androidchatclient.core.ChatApp
 import com.veselovvv.androidchatclient.ui.core.BaseFileUploadFragment
 import com.veselovvv.androidchatclient.ui.fileuploading.SetPathToFile
 import com.veselovvv.androidchatclient.ui.login.FieldType
+import com.veselovvv.androidchatclient.ui.login.LoginActivity
 import com.veselovvv.androidchatclient.ui.login.Validator
 import de.hdodenhof.circleimageview.CircleImageView
 
@@ -56,7 +58,9 @@ class SettingsFragment : BaseFileUploadFragment() {
         toolbar.setOnMenuItemClickListener {
             when (it.itemId) {
                 R.id.action_log_out -> {
-                    //TODO
+                    viewModel.cleanToken()
+                    requireActivity().startActivity(Intent(requireActivity(), LoginActivity::class.java))
+                    requireActivity().finish()
                     true
                 }
                 else -> false

app/src/main/java/com/veselovvv/androidchatclient/ui/user/SettingsViewModel.kt

@@ -65,4 +65,5 @@ class SettingsViewModel(
 
     fun getUserId() = userInteractor.getUserId()
     fun getUserToken() = userInteractor.getUserToken()
+    fun cleanToken() = userInteractor.cleanToken()
 }