Multi user app state enhanced

danishjamal104 · danishjamal104 · commit 84e56a027433 · 2021-06-06T09:47:15.000+05:30
unused val declaration removed
diff --git a/app/src/main/java/com/github/code/gambit/data/remote/services/file/FileServiceImpl.kt b/app/src/main/java/com/github/code/gambit/data/remote/services/file/FileServiceImpl.kt
@@ -5,6 +5,7 @@ import com.github.code.gambit.data.remote.responses.ListResponse
 import com.github.code.gambit.data.remote.services.ApiService
 import com.github.code.gambit.utility.sharedpreference.LastEvaluatedKeyManager
 import com.github.code.gambit.utility.sharedpreference.UserManager
+import java.lang.Exception
 
 class FileServiceImpl(
     val apiService: ApiService,
@@ -17,6 +18,9 @@ class FileServiceImpl(
     override suspend fun getFiles(): List<FileNetworkEntity> {
         val lek: String = lekManager.getLastEvalKey(LastEvaluatedKeyManager.KeyType.FILE)
         val listResponse: ListResponse<FileNetworkEntity> = apiService.getFiles(userId, lek, null)
+        if (listResponse.body == null) {
+            throw Exception(listResponse.error)
+        }
         if (listResponse.body?.lastEvaluatedKey != null) {
             lekManager.putLastEvalKey(
                 listResponse.body?.lastEvaluatedKey!!,
diff --git a/app/src/main/java/com/github/code/gambit/di/RepositoryModule.kt b/app/src/main/java/com/github/code/gambit/di/RepositoryModule.kt
@@ -5,13 +5,15 @@ import com.github.code.gambit.data.mapper.aws.UserAttributeMapper
 import com.github.code.gambit.data.remote.NetworkDataSource
 import com.github.code.gambit.data.remote.services.auth.AuthService
 import com.github.code.gambit.data.remote.services.auth.AuthServiceImpl
-import com.github.code.gambit.repositories.AuthRepository
+import com.github.code.gambit.repositories.auth.AuthRepository
+import com.github.code.gambit.repositories.auth.AuthRepositoryImpl
 import com.github.code.gambit.repositories.fileupload.FileUploadRepository
 import com.github.code.gambit.repositories.fileupload.FileUploadRepositoryImpl
 import com.github.code.gambit.repositories.home.HomeRepository
 import com.github.code.gambit.repositories.home.HomeRepositoryImpl
 import com.github.code.gambit.repositories.profile.ProfileRepository
 import com.github.code.gambit.repositories.profile.ProfileRepositoryImpl
+import com.github.code.gambit.utility.sharedpreference.LastEvaluatedKeyManager
 import com.github.code.gambit.utility.sharedpreference.UserManager
 import dagger.Module
 import dagger.Provides
@@ -40,10 +42,19 @@ object RepositoryModule {
     fun provideAuthRepository(
         authService: AuthService,
         networkDataSource: NetworkDataSource,
+        cacheDataSource: CacheDataSource,
         userManager: UserManager,
+        lastEvaluatedKeyManager: LastEvaluatedKeyManager,
         userAttributeMapper: UserAttributeMapper
     ): AuthRepository {
-        return AuthRepository(authService, networkDataSource, userManager, userAttributeMapper)
+        return AuthRepositoryImpl(
+            authService,
+            networkDataSource,
+            cacheDataSource,
+            userManager,
+            lastEvaluatedKeyManager,
+            userAttributeMapper
+        )
     }
 
     @Singleton
diff --git a/app/src/main/java/com/github/code/gambit/helper/profile/ProfileState.kt b/app/src/main/java/com/github/code/gambit/helper/profile/ProfileState.kt
@@ -4,6 +4,7 @@ import com.github.code.gambit.data.model.User
 
 sealed class ProfileState {
     object Loading : ProfileState()
+    object LogOutSuccess : ProfileState()
     data class Error(val message: String) : ProfileState()
     data class ProfileLoaded(val user: User) : ProfileState()
     object PasswordUpdated : ProfileState()
diff --git a/app/src/main/java/com/github/code/gambit/repositories/auth/AuthRepository.kt b/app/src/main/java/com/github/code/gambit/repositories/auth/AuthRepository.kt
@@ -0,0 +1,13 @@
+package com.github.code.gambit.repositories.auth
+
+import com.github.code.gambit.data.model.User
+import com.github.code.gambit.helper.ServiceResult
+import com.github.code.gambit.helper.auth.AuthData
+
+interface AuthRepository {
+
+    suspend fun login(authData: AuthData): ServiceResult<User>
+    suspend fun signUp(authData: AuthData): ServiceResult<Unit>
+    suspend fun logOut(): ServiceResult<Unit>
+    suspend fun signUpConfirmation(authData: AuthData): ServiceResult<User>
+}
diff --git a/app/src/main/java/com/github/code/gambit/repositories/auth/AuthRepositoryImpl.kt b/app/src/main/java/com/github/code/gambit/repositories/auth/AuthRepositoryImpl.kt
@@ -1,24 +1,29 @@
-package com.github.code.gambit.repositories
+package com.github.code.gambit.repositories.auth
 
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.util.CognitoJWTParser
+import com.github.code.gambit.data.local.CacheDataSource
 import com.github.code.gambit.data.mapper.aws.UserAttributeMapper
 import com.github.code.gambit.data.model.User
 import com.github.code.gambit.data.remote.NetworkDataSource
 import com.github.code.gambit.data.remote.services.auth.AuthService
 import com.github.code.gambit.helper.ServiceResult
 import com.github.code.gambit.helper.auth.AuthData
+import com.github.code.gambit.utility.sharedpreference.LastEvaluatedKeyManager
 import com.github.code.gambit.utility.sharedpreference.UserManager
+import java.lang.Exception
 
-class AuthRepository
+class AuthRepositoryImpl
 
 constructor(
     private val authService: AuthService,
     private val networkDataSource: NetworkDataSource,
+    private val cacheDataSource: CacheDataSource,
     private val userManager: UserManager,
+    private val lastEvaluatedKeyManager: LastEvaluatedKeyManager,
     private val userAttributeMapper: UserAttributeMapper
-) {
+) : AuthRepository {
 
-    suspend fun login(authData: AuthData): ServiceResult<User> {
+    override suspend fun login(authData: AuthData): ServiceResult<User> {
         val res = authService.login(authData)
         if (res is ServiceResult.Error) {
             return res
@@ -45,12 +50,10 @@ constructor(
 
         userManager.updateUser(User.merge(user, user_in_db))
 
-        val update = userManager.getUser()
-
         return ServiceResult.Success(user)
     }
 
-    suspend fun signUp(authData: AuthData): ServiceResult<Unit> {
+    override suspend fun signUp(authData: AuthData): ServiceResult<Unit> {
         val signUpRes = authService.signUp(authData)
         if (signUpRes is ServiceResult.Error) {
             return signUpRes
@@ -59,7 +62,19 @@ constructor(
         return signUpRes
     }
 
-    suspend fun signUpConfirmation(authData: AuthData): ServiceResult<User> {
+    override suspend fun logOut(): ServiceResult<Unit> {
+        return try {
+            authService.logOut()
+            userManager.revokeAuthentication()
+            lastEvaluatedKeyManager.flush()
+            cacheDataSource.deleteFiles()
+            return ServiceResult.Success(Unit)
+        } catch (exception: Exception) {
+            ServiceResult.Error(exception)
+        }
+    }
+
+    override suspend fun signUpConfirmation(authData: AuthData): ServiceResult<User> {
         val confirmationResult = authService.confirmSignUp(authData)
         if (confirmationResult is ServiceResult.Error) {
             return confirmationResult
diff --git a/app/src/main/java/com/github/code/gambit/repositories/home/HomeRepositoryImpl.kt b/app/src/main/java/com/github/code/gambit/repositories/home/HomeRepositoryImpl.kt
@@ -26,13 +26,12 @@ constructor(
             try {
                 data = networkDataSource.getFiles()
                 cacheDataSource.insertFiles(data)
+                val files = cacheDataSource.getFiles()
+                emit(ServiceResult.Success(files))
             } catch (internet: NoInternetException) {
                 emit(ServiceResult.Error(internet))
             } catch (exception: Exception) {
                 emit(ServiceResult.Error(exception))
-            } finally {
-                val files = cacheDataSource.getFiles()
-                emit(ServiceResult.Success(files))
             }
         }
     }
diff --git a/app/src/main/java/com/github/code/gambit/repositories/profile/ProfileRepository.kt b/app/src/main/java/com/github/code/gambit/repositories/profile/ProfileRepository.kt
@@ -9,5 +9,4 @@ interface ProfileRepository {
     suspend fun getUser(): Flow<ServiceResult<User>>
     suspend fun updateUserName(name: String): ServiceResult<String>
     suspend fun updateUserPassword(oldPassword: String, newPassword: String): ServiceResult<Boolean>
-    suspend fun logOut(): ServiceResult<Unit>
 }
diff --git a/app/src/main/java/com/github/code/gambit/repositories/profile/ProfileRepositoryImpl.kt b/app/src/main/java/com/github/code/gambit/repositories/profile/ProfileRepositoryImpl.kt
@@ -49,7 +49,10 @@ constructor(
         }
     }
 
-    override suspend fun updateUserPassword(oldPassword: String, newPassword: String): ServiceResult<Boolean> {
+    override suspend fun updateUserPassword(
+        oldPassword: String,
+        newPassword: String
+    ): ServiceResult<Boolean> {
         return try {
             val result = authService.resetPassword(oldPassword, newPassword)
             if (result is ServiceResult.Error) {
@@ -73,13 +76,4 @@ constructor(
             ServiceResult.Error(e)
         }
     }
-
-    override suspend fun logOut(): ServiceResult<Unit> {
-        return try {
-            authService.logOut()
-            return ServiceResult.Success(Unit)
-        } catch (exception: Exception) {
-            ServiceResult.Error(exception)
-        }
-    }
 }
diff --git a/app/src/main/java/com/github/code/gambit/ui/activity/main/MainActivity.kt b/app/src/main/java/com/github/code/gambit/ui/activity/main/MainActivity.kt
@@ -81,8 +81,7 @@ class MainActivity : AppCompatActivity(), BottomNavController {
                 R.id.homeFragment -> {
                     // info bottomNav is hiddent until data is loading in homeFragment
                     // binding.bottomNavContainer.bottomNavShow()
-                    binding.root.getTransition(R.id.start_to_end).setEnable(true)
-                    binding.dragIcon.show()
+                    showMotionLayout()
                 }
                 R.id.authFragment -> {
                     hideBottomNav()
@@ -161,6 +160,16 @@ class MainActivity : AppCompatActivity(), BottomNavController {
         viewModel.setEvent(MainEvent.UploadFileEvent(fileUri!!))
     }
 
+    private fun showMotionLayout() {
+        binding.root.getTransition(R.id.start_to_end).setEnable(true)
+        binding.dragIcon.show()
+    }
+
+    private fun hideMotionLayout() {
+        binding.root.getTransition(R.id.start_to_end).setEnable(false)
+        binding.dragIcon.hide()
+    }
+
     private fun registerAmplifyCallback() {
         Amplify.Hub.subscribe(HubChannel.AUTH) { event ->
             when (event.name) {
@@ -172,8 +181,8 @@ class MainActivity : AppCompatActivity(), BottomNavController {
                     AuthChannelEventName.SIGNED_IN ->
                         Timber.tag("AuthQuickstart").i("Auth just became signed in")
                     AuthChannelEventName.SIGNED_OUT -> {
-                        userManager.revokeAuthentication()
                         Timber.tag("AuthQuickstart").i("Auth just became signed out")
+                        runOnUiThread { hideMotionLayout() }
                     }
                     AuthChannelEventName.SESSION_EXPIRED -> {
                         userManager.revokeAuthentication()
@@ -187,6 +196,10 @@ class MainActivity : AppCompatActivity(), BottomNavController {
     }
 
     override fun onBackPressed() {
+        if (!userManager.isAuthenticated()) {
+            super.onBackPressed()
+            return
+        }
         val hostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment_container)
         if (hostFragment is NavHostFragment) {
             when (val fragment = hostFragment.childFragmentManager.fragments.first()) {
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/auth/AuthFragmentAdapter.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/auth/AuthFragmentAdapter.kt
@@ -13,12 +13,8 @@ class AuthFragmentAdapter(
     private var fragments: List<Fragment> = listOf(SignUpFragment(), LoginFragment())
 
     companion object {
-        private var adapter: AuthFragmentAdapter? = null
         fun getInstance(fragmentManager: FragmentManager, lifecycle: Lifecycle): AuthFragmentAdapter {
-            if (adapter == null) {
-                adapter = AuthFragmentAdapter(fragmentManager, lifecycle)
-            }
-            return adapter as AuthFragmentAdapter
+            return AuthFragmentAdapter(fragmentManager, lifecycle)
         }
     }
 
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/auth/AuthViewModel.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/auth/AuthViewModel.kt
@@ -9,7 +9,7 @@ import com.github.code.gambit.data.model.User
 import com.github.code.gambit.helper.ServiceResult
 import com.github.code.gambit.helper.auth.AuthData
 import com.github.code.gambit.helper.auth.AuthState
-import com.github.code.gambit.repositories.AuthRepository
+import com.github.code.gambit.repositories.auth.AuthRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/profile/ProfileFragment.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/profile/ProfileFragment.kt
@@ -5,6 +5,7 @@ import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import com.github.code.gambit.R
 import com.github.code.gambit.data.model.User
 import com.github.code.gambit.databinding.FragmentProfileBinding
@@ -38,6 +39,10 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
         viewModel.profileState.observe(viewLifecycleOwner) {
             when (it) {
                 is ProfileState.Loading -> binding.progressBar.show()
+                is ProfileState.LogOutSuccess -> {
+                    showSnack("Log out success")
+                    findNavController().navigate(R.id.action_profileFragment_to_authFragment)
+                }
                 is ProfileState.PasswordUpdated -> binding.apply {
                     this.progressBar.hide()
                     showSnack("Password updated")
@@ -94,6 +99,7 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
             }
         }
         binding.logOutButton.setOnClickListener {
+            binding.logOutButton.isEnabled = false
             viewModel.setEvent(ProfileEvent.LogOut)
         }
         changePasswordListener1 = View.OnClickListener {
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/profile/ProfileViewModel.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/profile/ProfileViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.github.code.gambit.helper.ServiceResult
 import com.github.code.gambit.helper.profile.ProfileState
+import com.github.code.gambit.repositories.auth.AuthRepository
 import com.github.code.gambit.repositories.profile.ProfileRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.launchIn
@@ -17,7 +18,10 @@ import javax.inject.Inject
 @HiltViewModel
 class ProfileViewModel
 @Inject
-constructor(private val profileRepository: ProfileRepository) : ViewModel() {
+constructor(
+    private val profileRepository: ProfileRepository,
+    private val authRepository: AuthRepository
+) : ViewModel() {
 
     private val _profileState = MutableLiveData<ProfileState>()
 
@@ -27,9 +31,9 @@ constructor(private val profileRepository: ProfileRepository) : ViewModel() {
         viewModelScope.launch {
             when (event) {
                 ProfileEvent.LogOut -> {
-                    when (val it = profileRepository.logOut()) {
+                    when (val it = authRepository.logOut()) {
                         is ServiceResult.Error -> postError(it.exception)
-                        is ServiceResult.Success -> postError(Exception("LOG OUT SUCCESS"))
+                        is ServiceResult.Success -> _profileState.postValue(ProfileState.LogOutSuccess)
                     }
                 }
                 ProfileEvent.GetUserInfoEvent -> {
@@ -47,12 +51,21 @@ constructor(private val profileRepository: ProfileRepository) : ViewModel() {
                     _profileState.postValue(ProfileState.Loading)
                     when (val res = profileRepository.updateUserName(event.name)) {
                         is ServiceResult.Error -> postError(res.exception)
-                        is ServiceResult.Success -> _profileState.postValue(ProfileState.UserNameUpdated(res.data))
+                        is ServiceResult.Success -> _profileState.postValue(
+                            ProfileState.UserNameUpdated(
+                                res.data
+                            )
+                        )
                     }
                 }
                 is ProfileEvent.UpdatePasswordEvent -> {
                     _profileState.postValue(ProfileState.Loading)
-                    when (val res = profileRepository.updateUserPassword(event.oldPassword, event.newPassword)) {
+                    when (
+                        val res = profileRepository.updateUserPassword(
+                            event.oldPassword,
+                            event.newPassword
+                        )
+                    ) {
                         is ServiceResult.Error -> postError(res.exception)
                         is ServiceResult.Success -> {
                             if (res.data) {
@@ -75,6 +88,8 @@ constructor(private val profileRepository: ProfileRepository) : ViewModel() {
 sealed class ProfileEvent {
     object LogOut : ProfileEvent()
     object GetUserInfoEvent : ProfileEvent()
-    data class UpdatePasswordEvent(val oldPassword: String, val newPassword: String) : ProfileEvent()
+    data class UpdatePasswordEvent(val oldPassword: String, val newPassword: String) :
+        ProfileEvent()
+
     data class UpdateDisplayNameEvent(val name: String) : ProfileEvent()
 }
diff --git a/app/src/main/java/com/github/code/gambit/utility/sharedpreference/LastEvaluatedKeyManager.kt b/app/src/main/java/com/github/code/gambit/utility/sharedpreference/LastEvaluatedKeyManager.kt
@@ -21,7 +21,7 @@ constructor(@ApplicationContext context: Context) : PreferenceManager(context) {
     }
 
     fun flush() {
-        putLastEvalKey("", KeyType.URL)
+        putLastEvalKey("", KeyType.FILE)
         putLastEvalKey("", KeyType.URL)
     }
 
diff --git a/app/src/main/java/com/github/code/gambit/utility/sharedpreference/UserManager.kt b/app/src/main/java/com/github/code/gambit/utility/sharedpreference/UserManager.kt
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml

Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,12 @@ constructor(`
`26`	`26`	`try {`
`27`	`27`	`data = networkDataSource.getFiles()`
`28`	`28`	`cacheDataSource.insertFiles(data)`
	`29`	`+ val files = cacheDataSource.getFiles()`
	`30`	`+ emit(ServiceResult.Success(files))`
`29`	`31`	`} catch (internet: NoInternetException) {`
`30`	`32`	`emit(ServiceResult.Error(internet))`
`31`	`33`	`} catch (exception: Exception) {`
`32`	`34`	`emit(ServiceResult.Error(exception))`
`33`		`- } finally {`
`34`		`- val files = cacheDataSource.getFiles()`
`35`		`- emit(ServiceResult.Success(files))`
`36`	`35`	`}`
`37`	`36`	`}`
`38`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,4 @@ interface ProfileRepository {`
`9`	`9`	`suspend fun getUser(): Flow<ServiceResult<User>>`
`10`	`10`	`suspend fun updateUserName(name: String): ServiceResult<String>`
`11`	`11`	`suspend fun updateUserPassword(oldPassword: String, newPassword: String): ServiceResult<Boolean>`
`12`		`- suspend fun logOut(): ServiceResult<Unit>`
`13`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,10 @@ constructor(`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`- override suspend fun updateUserPassword(oldPassword: String, newPassword: String): ServiceResult<Boolean> {`
	`52`	`+ override suspend fun updateUserPassword(`
	`53`	`+ oldPassword: String,`
	`54`	`+ newPassword: String`
	`55`	`+ ): ServiceResult<Boolean> {`
`53`	`56`	`return try {`
`54`	`57`	`val result = authService.resetPassword(oldPassword, newPassword)`
`55`	`58`	`if (result is ServiceResult.Error) {`
`@@ -73,13 +76,4 @@ constructor(`
`73`	`76`	`ServiceResult.Error(e)`
`74`	`77`	`}`
`75`	`78`	`}`
`76`		`-`
`77`		`- override suspend fun logOut(): ServiceResult<Unit> {`
`78`		`- return try {`
`79`		`- authService.logOut()`
`80`		`- return ServiceResult.Success(Unit)`
`81`		`- } catch (exception: Exception) {`
`82`		`- ServiceResult.Error(exception)`
`83`		`- }`
`84`		`- }`
`85`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,8 @@ class AuthFragmentAdapter(`
`13`	`13`	`private var fragments: List<Fragment> = listOf(SignUpFragment(), LoginFragment())`
`14`	`14`
`15`	`15`	`companion object {`
`16`		`- private var adapter: AuthFragmentAdapter? = null`
`17`	`16`	`fun getInstance(fragmentManager: FragmentManager, lifecycle: Lifecycle): AuthFragmentAdapter {`
`18`		`- if (adapter == null) {`
`19`		`- adapter = AuthFragmentAdapter(fragmentManager, lifecycle)`
`20`		`- }`
`21`		`- return adapter as AuthFragmentAdapter`
	`17`	`+ return AuthFragmentAdapter(fragmentManager, lifecycle)`
`22`	`18`	`}`
`23`	`19`	`}`
`24`	`20`