From 20d8303966d000614c747b245748aad684008239 Mon Sep 17 00:00:00 2001
From: FerdyRod <ferdy@dhis2.org>
Date: Fri, 11 Oct 2024 11:33:11 +0200
Subject: [PATCH] Remove automatic logout feature config. It is now always
 activated

---
 .../featureconfig/data/FeatureConfigRepositoryImpl.kt      | 2 +-
 .../java/org/dhis2/commons/featureconfig/model/Feature.kt  | 1 -
 .../java/org/dhis2/commons/service/SessionManagerModule.kt | 7 ++-----
 .../org/dhis2/commons/service/SessionManagerServiceImpl.kt | 5 -----
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/commons/src/main/java/org/dhis2/commons/featureconfig/data/FeatureConfigRepositoryImpl.kt b/commons/src/main/java/org/dhis2/commons/featureconfig/data/FeatureConfigRepositoryImpl.kt
index 0054f15090..96cf27b0a0 100644
--- a/commons/src/main/java/org/dhis2/commons/featureconfig/data/FeatureConfigRepositoryImpl.kt
+++ b/commons/src/main/java/org/dhis2/commons/featureconfig/data/FeatureConfigRepositoryImpl.kt
@@ -58,8 +58,8 @@ class FeatureConfigRepositoryImpl @Inject constructor(
 
     private fun featureOptions(feature: Feature): FeatureOptions? {
         return when (feature) {
-            Feature.AUTO_LOGOUT -> null
             Feature.RESPONSIVE_HOME -> FeatureOptions.ResponsiveHome(totalItems = getResponsiveHomeTotalItems())
+            else -> null
         }
     }
 
diff --git a/commons/src/main/java/org/dhis2/commons/featureconfig/model/Feature.kt b/commons/src/main/java/org/dhis2/commons/featureconfig/model/Feature.kt
index 7b5e976a50..5ca3c6806a 100644
--- a/commons/src/main/java/org/dhis2/commons/featureconfig/model/Feature.kt
+++ b/commons/src/main/java/org/dhis2/commons/featureconfig/model/Feature.kt
@@ -1,6 +1,5 @@
 package org.dhis2.commons.featureconfig.model
 
 enum class Feature(val description: String) {
-    AUTO_LOGOUT("automatic log out"),
     RESPONSIVE_HOME("responsive home"),
 }
diff --git a/commons/src/main/java/org/dhis2/commons/service/SessionManagerModule.kt b/commons/src/main/java/org/dhis2/commons/service/SessionManagerModule.kt
index d1ad420c1f..22fe791968 100644
--- a/commons/src/main/java/org/dhis2/commons/service/SessionManagerModule.kt
+++ b/commons/src/main/java/org/dhis2/commons/service/SessionManagerModule.kt
@@ -2,7 +2,6 @@ package org.dhis2.commons.service
 
 import dagger.Module
 import dagger.Provides
-import org.dhis2.commons.featureconfig.data.FeatureConfigRepository
 import org.dhis2.commons.prefs.PreferenceProvider
 import org.dhis2.commons.schedulers.SchedulerProvider
 import org.hisp.dhis.android.core.D2
@@ -17,9 +16,8 @@ open class SessionManagerModule() {
     fun providesSessionManagerService(
         schedulerProvider: SchedulerProvider,
         preferences: PreferenceProvider,
-        featureConfigRepository: FeatureConfigRepository,
     ): SessionManagerService {
-        return SessionManagerServiceImpl(provideSdk(), schedulerProvider, preferences, featureConfigRepository)
+        return SessionManagerServiceImpl(provideSdk(), schedulerProvider, preferences)
     }
 
     @Provides
@@ -27,9 +25,8 @@ open class SessionManagerModule() {
     fun providesSessionManagerServiceImpl(
         schedulerProvider: SchedulerProvider,
         preferences: PreferenceProvider,
-        featureConfigRepository: FeatureConfigRepository,
     ): SessionManagerServiceImpl {
-        return SessionManagerServiceImpl(provideSdk(), schedulerProvider, preferences, featureConfig = featureConfigRepository)
+        return SessionManagerServiceImpl(provideSdk(), schedulerProvider, preferences)
     }
 
     private fun provideSdk(): D2 {
diff --git a/commons/src/main/java/org/dhis2/commons/service/SessionManagerServiceImpl.kt b/commons/src/main/java/org/dhis2/commons/service/SessionManagerServiceImpl.kt
index 85433f9201..9bc344b2f6 100644
--- a/commons/src/main/java/org/dhis2/commons/service/SessionManagerServiceImpl.kt
+++ b/commons/src/main/java/org/dhis2/commons/service/SessionManagerServiceImpl.kt
@@ -3,8 +3,6 @@ package org.dhis2.commons.service
 import androidx.lifecycle.LifecycleCoroutineScope
 import io.reactivex.Completable
 import kotlinx.coroutines.launch
-import org.dhis2.commons.featureconfig.data.FeatureConfigRepository
-import org.dhis2.commons.featureconfig.model.Feature
 import org.dhis2.commons.filters.FilterManager
 import org.dhis2.commons.prefs.Preference
 import org.dhis2.commons.prefs.Preference.Companion.PIN
@@ -17,7 +15,6 @@ class SessionManagerServiceImpl(
     private val d2: D2,
     private val schedulerProvider: SchedulerProvider,
     private val preferences: PreferenceProvider,
-    private val featureConfig: FeatureConfigRepository,
 ) : SessionManagerService {
 
     override fun onUserInteraction() {
@@ -28,8 +25,6 @@ class SessionManagerServiceImpl(
         val currentTime = System.currentTimeMillis()
         return if (currentTime - preferences.getLong(Preference.LAST_USER_INTERACTION.toString(), 0L)!! > SESSION_TIMEOUT_DURATION && !preferences.getBoolean(
                 Preference.PIN_ENABLED, false,
-            ) && featureConfig.isFeatureEnable(
-                Feature.AUTO_LOGOUT,
             )
         ) {
             logoutUser(navigateAction, scope)