diff --git a/app/src/main/java/com/naviapp/home/activity/NewDashboardActivity.kt b/app/src/main/java/com/naviapp/home/activity/NewDashboardActivity.kt index dc3c8ee065..57840af34a 100644 --- a/app/src/main/java/com/naviapp/home/activity/NewDashboardActivity.kt +++ b/app/src/main/java/com/naviapp/home/activity/NewDashboardActivity.kt @@ -191,9 +191,6 @@ class NewDashboardActivity : } } - /* - * If you are adding new fragment here, please add in the hideFragments(fragmentTransaction) method too - * */ private fun getFragment(screen: String, bundle: Bundle?): Fragment { return when (screen) { HomeFragment.TAG -> HomeFragment.newInstance(bundle) @@ -412,9 +409,8 @@ class NewDashboardActivity : } private fun checkForAppUpdate() { - updateApp(screenName = com.navi.common.utils.Constants.HOME_LOAN) { - updateAppDetails, - startUpdatingApp -> + updateApp(screenName = com.navi.common.utils.Constants.HOME_LOAN) { updateAppDetails, + startUpdatingApp -> updateInAppDialog = UpdateInAppDialog(updateAppDetails, this) { startUpdatingApp.invoke() } updateInAppDialog.safelyShowDialog() @@ -629,14 +625,9 @@ class NewDashboardActivity : } private fun hideFragments(fragmentTransaction: FragmentTransaction) { - hideFragments(HomeFragment.TAG, fragmentTransaction) - hideFragments(DashboardFragment.TAG, fragmentTransaction) - hideFragments(ProfileFragment.TAG, fragmentTransaction) - hideFragments(FundListingFragmentV2.TAG, fragmentTransaction) - } - - private fun hideFragments(tag: String, fragmentTransaction: FragmentTransaction) { - val currentFragment: Fragment? = supportFragmentManager.findFragmentByTag(tag) - currentFragment?.let { fragmentTransaction.hide(it) } + val fragments = supportFragmentManager.fragments + fragments.forEach { currentFragment -> + currentFragment?.let { fragmentTransaction.hide(it) } + } } } \ No newline at end of file diff --git a/navi-common/src/main/java/com/navi/common/firebaseremoteconfig/FirebaseRemoteConfigHelper.kt b/navi-common/src/main/java/com/navi/common/firebaseremoteconfig/FirebaseRemoteConfigHelper.kt index 17a52f6ae5..11d220e40c 100644 --- a/navi-common/src/main/java/com/navi/common/firebaseremoteconfig/FirebaseRemoteConfigHelper.kt +++ b/navi-common/src/main/java/com/navi/common/firebaseremoteconfig/FirebaseRemoteConfigHelper.kt @@ -24,7 +24,6 @@ object FirebaseRemoteConfigHelper { const val RAGE_TAP_COUNT = "RAGE_TAP_COUNT" const val API_CACHING_TIME = "API_CACHING_TIME" const val API_CACHING_DISABLE = "API_CACHING_DISABLE" - const val API_CACHING_DISABLE_SCREENS = "API_CACHING_DISABLE_SCREENS" const val RAGE_TAP_DELAY_TIME = "RAGE_TAP_DELAY_TIME" const val RETRY_COUNT_OF_SMS_INGESTION = "RETRY_COUNT_OF_SMS_INGESTION" const val GST_USERNAME_PASSWORD_MAX_LIMIT = "GST_USERNAME_PASSWORD_MAX_LIMIT" diff --git a/navi-common/src/main/java/com/navi/common/ui/activity/BaseActivity.kt b/navi-common/src/main/java/com/navi/common/ui/activity/BaseActivity.kt index 81ff5c8e20..799d2986d1 100644 --- a/navi-common/src/main/java/com/navi/common/ui/activity/BaseActivity.kt +++ b/navi-common/src/main/java/com/navi/common/ui/activity/BaseActivity.kt @@ -22,7 +22,6 @@ import androidx.annotation.LayoutRes import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentManager import androidx.lifecycle.ViewModelProvider import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.play.core.appupdate.AppUpdateInfo @@ -121,7 +120,6 @@ abstract class BaseActivity : if (BaseUtils.isUserLoggedIn()) checkLocationPermission() inAppUpdate.addLifeCycleObserver(lifecycle) inAppUpdate.addInAppUpdateListener(this) - TemporaryStorageHelper.addScreen(screenName) } override fun onResume() { diff --git a/navi-common/src/main/java/com/navi/common/ui/dialog/BaseDialogFragment.kt b/navi-common/src/main/java/com/navi/common/ui/dialog/BaseDialogFragment.kt index f35ebf8aff..50fc11bdc9 100644 --- a/navi-common/src/main/java/com/navi/common/ui/dialog/BaseDialogFragment.kt +++ b/navi-common/src/main/java/com/navi/common/ui/dialog/BaseDialogFragment.kt @@ -18,7 +18,6 @@ import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding import androidx.fragment.app.DialogFragment import com.navi.common.R -import com.navi.common.utils.TemporaryStorageHelper abstract class BaseDialogFragment( @LayoutRes val layoutId: Int, @@ -41,7 +40,6 @@ abstract class BaseDialogFragment( savedInstanceState: Bundle?, ): View? { binding = DataBindingUtil.inflate(inflater, layoutId, container, false, null) - TemporaryStorageHelper.addScreen(screenName) return binding.root } diff --git a/navi-common/src/main/java/com/navi/common/ui/fragment/BaseFragment.kt b/navi-common/src/main/java/com/navi/common/ui/fragment/BaseFragment.kt index 438fa9fe1b..366b6a4b22 100644 --- a/navi-common/src/main/java/com/navi/common/ui/fragment/BaseFragment.kt +++ b/navi-common/src/main/java/com/navi/common/ui/fragment/BaseFragment.kt @@ -158,7 +158,6 @@ abstract class BaseFragment : Fragment() { if (screenName.isNotBlank()) { NaviTrackEvent.startScreen(screenName, getStartScreenEventAttributes()) } - TemporaryStorageHelper.addScreen(screenName) NaviTrackEvent.sendScreenTransitionEvent(screenName) setupQueryMap() } diff --git a/navi-common/src/main/java/com/navi/common/utils/TemporaryStorageHelper.kt b/navi-common/src/main/java/com/navi/common/utils/TemporaryStorageHelper.kt index b7aa3ac059..1583ac1813 100644 --- a/navi-common/src/main/java/com/navi/common/utils/TemporaryStorageHelper.kt +++ b/navi-common/src/main/java/com/navi/common/utils/TemporaryStorageHelper.kt @@ -28,7 +28,6 @@ object TemporaryStorageHelper { private var viewVisible = HashMap() private var apiTs = HashMap() private var isScreenDataNeedsToUpdated = HashMap() - private var screens = arrayListOf() fun clear() { homePageResponse = null @@ -62,10 +61,6 @@ object TemporaryStorageHelper { } if (FirebaseRemoteConfigHelper.getBoolean(FirebaseRemoteConfigHelper.API_CACHING_DISABLE) - || isCachingDisableForThisFlow( - screens, - FirebaseRemoteConfigHelper.getString(FirebaseRemoteConfigHelper.API_CACHING_DISABLE_SCREENS) - ) || isScreenDataNeedsToUpdated[key].orFalse() ) { return true @@ -75,12 +70,4 @@ object TemporaryStorageHelper { return lastApiCallTime > FirebaseRemoteConfigHelper.getLong(FirebaseRemoteConfigHelper.API_CACHING_TIME) } - - fun addScreen(screenName: String) { - screens.add(screenName) - } - - fun clearScreens() { - screens.clear() - } } \ No newline at end of file diff --git a/navi-common/src/main/java/com/navi/common/utils/Utility.kt b/navi-common/src/main/java/com/navi/common/utils/Utility.kt index c40a5b2b52..53285a9c9a 100644 --- a/navi-common/src/main/java/com/navi/common/utils/Utility.kt +++ b/navi-common/src/main/java/com/navi/common/utils/Utility.kt @@ -13,8 +13,6 @@ import android.net.ConnectivityManager import android.os.Environment import android.view.View import android.view.inputmethod.InputMethodManager -import com.google.common.reflect.TypeToken -import com.google.gson.Gson import com.navi.analytics.appsflyer.AppsFlyerUtil import com.navi.base.sharedpref.CommonPrefConstants import com.navi.base.sharedpref.PreferenceManager @@ -224,18 +222,5 @@ fun cacheDirUri(fileName: String, applicationContext: Context): String { return "file://${applicationContext.externalCacheDir?.path}/$fileName" } -fun isCachingDisableForThisFlow(firstList: List, secondData: String): Boolean { - if (firstList.isEmpty() || secondData.isEmpty()) - return false - val secondList = - Gson().fromJson>(secondData, object : TypeToken>() {}.type) - secondList.forEach { - if (firstList.contains(it).orFalse()) { - return true - } - } - return false -} - fun downloadsDirUri(fileName: String) = "file://${Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).path}/$fileName" diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/activity/BaseActivity.kt b/navi-insurance/src/main/java/com/navi/insurance/health/activity/BaseActivity.kt index 4c6bcb4055..3957138c32 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/activity/BaseActivity.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/activity/BaseActivity.kt @@ -95,7 +95,6 @@ abstract class BaseActivity : AppCompatActivity() { mapOf(Pair("type", "activity")) ) } - TemporaryStorageHelper.addScreen(screenName) } override fun onStart() { diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/BaseFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/BaseFragment.kt index e5e987e958..0aaac954e9 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/BaseFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/BaseFragment.kt @@ -27,7 +27,6 @@ import com.navi.common.network.models.ErrorMessage import com.navi.common.network.models.GenericErrorResponse import com.navi.common.ui.fragment.CommonDialogBox import com.navi.common.utils.CommonNaviAnalytics -import com.navi.common.utils.TemporaryStorageHelper import com.navi.common.utils.getNetworkType import com.navi.insurance.R import com.navi.insurance.analytics.NaviInsuranceAnalytics @@ -73,7 +72,6 @@ abstract class BaseFragment : Fragment() { savedInstanceState: Bundle? ): View? { NaviTrackEvent.sendScreenTransitionEvent(screenName) - TemporaryStorageHelper.addScreen(screenName) return super.onCreateView(inflater, container, savedInstanceState) }