Skip to content

play around with an inactivity timeout singleton #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahaly92 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

play around with an inactivity timeout singleton #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/src/main/java/com/yeetsies/starterproject/screens/home/HomeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.view.View
import com.yeetsies.core.ui.base.BaseFragment
import com.yeetsies.core.ui.screens.home.HomeViewModel
import com.yeetsies.starterproject.R
import kotlinx.android.synthetic.main.fragment_home.restartTimer

class HomeFragment : BaseFragment<HomeViewModel>() {
override val layoutResourceId: Int = R.layout.fragment_home
Expand All @@ -13,6 +14,13 @@ class HomeFragment : BaseFragment<HomeViewModel>() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
configureViewModel()
configureUIListeners()
}

private fun configureUIListeners() {
view?.apply {
restartTimer.setOnClickListener { viewModel.restartTimerClicked() }
}
}

private fun configureViewModel() {
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/res/layout/fragment_home.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
>

<TextView
android:id="@+id/homeText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/home_screen_text"
Expand All @@ -16,4 +17,15 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>

<Button
android:id="@+id/restartTimer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_sm"
app:layout_constraintTop_toBottomOf="@id/homeText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:text="@string/restart_timer"
/>
</androidx.constraintlayout.ConstraintLayout>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@

<!--Home-->
<string name="home_screen_text">you are home</string>
<string name="restart_timer">restart timer</string>
</resources>
26 changes: 25 additions & 1 deletion core/src/main/java/com/yeetsies/core/ui/base/BaseFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,19 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
import androidx.navigation.Navigation
import com.yeetsies.core.R
import com.yeetsies.core.navigation.LiveNavigationField
import com.yeetsies.core.navigation.NavigationEvent
import com.yeetsies.core.utils.InactivityLogoutManagerImpl
import io.reactivex.disposables.Disposable

abstract class BaseFragment<out VM : BaseViewModel> : Fragment() {
abstract class BaseFragment<out VM : BaseViewModel>(
private val inactivityLogoutManagerImpl: InactivityLogoutManagerImpl = InactivityLogoutManagerImpl()
) : Fragment() {
protected abstract val layoutResourceId: Int

private lateinit var timerDisposable: Disposable

abstract fun createViewModel(): VM

@Suppress("UNCHECKED_CAST")
Expand All @@ -36,6 +43,23 @@ abstract class BaseFragment<out VM : BaseViewModel> : Fragment() {
return inflater.inflate(layoutResourceId, container, false)
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
if (viewModel.requiresAuth) {
timerDisposable = inactivityLogoutManagerImpl.getTimerCompleteBehaviorSubject().subscribe {
if (it) {
navigate(NavigationEvent(R.id.loginFragment))
InactivityLogoutManagerImpl().onLogout()
}
}
}
}

override fun onDestroy() {
super.onDestroy()
timerDisposable.dispose()
}

protected fun configureNavigationListener(navigationLiveDataField: LiveNavigationField<NavigationEvent>) {
navigationLiveDataField.observe(viewLifecycleOwner, Observer { navigate(it) })
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/yeetsies/core/ui/base/BaseViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import com.yeetsies.core.navigation.NavigationEvent
import com.yeetsies.core.navigation.Navigator

abstract class BaseViewModel : ViewModel() {
protected abstract val requiresAuth: Boolean
open val requiresAuth: Boolean = true
}

abstract class NavigationViewModel : BaseViewModel() {
Expand Down
9 changes: 8 additions & 1 deletion core/src/main/java/com/yeetsies/core/ui/screens/home/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ import com.yeetsies.core.R
import com.yeetsies.core.navigation.NavigationDestination
import com.yeetsies.core.ui.base.NavigationViewModel
import com.yeetsies.core.ui.screens.login.LoginDestination
import com.yeetsies.core.utils.InactivityLogoutManagerImpl

class HomeViewModel : NavigationViewModel() {
class HomeViewModel(
private val inactivityLogoutManagerImpl: InactivityLogoutManagerImpl = InactivityLogoutManagerImpl()
) : NavigationViewModel() {
override val requiresAuth: Boolean = true
private val loggedIn: Boolean = true

Expand All @@ -14,6 +17,10 @@ class HomeViewModel : NavigationViewModel() {
navigator.navigateTo(LoginDestination())
}
}

fun restartTimerClicked() {
inactivityLogoutManagerImpl.restartTimer()
}
}

class HomeDestination : NavigationDestination(R.id.action_loginFragment_to_homeFragment)
5 changes: 4 additions & 1 deletion core/src/main/java/com/yeetsies/core/ui/screens/login/LoginViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ import com.yeetsies.core.R
import com.yeetsies.core.navigation.NavigationDestination
import com.yeetsies.core.repository.login.LoginRepository
import com.yeetsies.core.rest.Result
import com.yeetsies.core.utils.InactivityLogoutManagerImpl
import com.yeetsies.core.ui.base.NavigationViewModel
import com.yeetsies.core.ui.screens.home.HomeDestination

class LoginViewModel(
private val loginRepository: LoginRepository
private val loginRepository: LoginRepository,
private val inactivityLogoutManagerImpl: InactivityLogoutManagerImpl = InactivityLogoutManagerImpl()
) : NavigationViewModel() {
override val requiresAuth: Boolean = false

Expand All @@ -35,6 +37,7 @@ class LoginViewModel(
}
is Result.Success -> {
navigator.navigateTo(HomeDestination())
inactivityLogoutManagerImpl.startTimer()
}
}
}
Expand Down
66 changes: 66 additions & 0 deletions core/src/main/java/com/yeetsies/core/utils/InactivityLogoutManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
package com.yeetsies.core.utils

import io.reactivex.Observable
import io.reactivex.disposables.Disposable
import io.reactivex.subjects.BehaviorSubject
import timber.log.Timber
import java.util.Date
import java.util.concurrent.TimeUnit

class InactivityLogoutManagerImpl : InactivityLogoutManager {

companion object {
private const val INACTIVITY_LOGOUT_TIME_SEC = 10L

private var timerDisposable: Disposable? = null
private val timerCompleteBehaviorSubject: BehaviorSubject<Boolean> = BehaviorSubject.create()
private var lastTimerReset: Date? = null
}

override fun stopTimer() {
timerDisposable?.dispose()
timerCompleteBehaviorSubject.onNext(false)
}

override fun startTimer() {
restartTimer()
}

override fun restartTimer() {
stopTimer()
lastTimerReset = Date()
timerDisposable = getTimer().subscribe()
}

override fun isBackgroundSessionTimedOut(): Boolean {
lastTimerReset?.apply {
return (Date().time - time) / 1000L > INACTIVITY_LOGOUT_TIME_SEC
}
return false
}

override fun onLogout() {
stopTimer()
lastTimerReset = null
}

override fun getTimerCompleteBehaviorSubject() = timerCompleteBehaviorSubject

private fun getTimer(): Observable<Long> {
return Observable.interval(1L, TimeUnit.SECONDS)
.doOnNext {
Timber.d((INACTIVITY_LOGOUT_TIME_SEC - it).toString())
}.takeUntil { it == INACTIVITY_LOGOUT_TIME_SEC }.doOnComplete {
timerCompleteBehaviorSubject.onNext(true)
}
}
}

interface InactivityLogoutManager {
fun startTimer()
fun restartTimer()
fun stopTimer()
fun isBackgroundSessionTimedOut(): Boolean
fun onLogout()
fun getTimerCompleteBehaviorSubject(): BehaviorSubject<Boolean>
}