diff --git a/android/app/src/main/java/com/naviapp/app/NaviApplication.kt b/android/app/src/main/java/com/naviapp/app/NaviApplication.kt index 5d095cf444..752e9d6a18 100644 --- a/android/app/src/main/java/com/naviapp/app/NaviApplication.kt +++ b/android/app/src/main/java/com/naviapp/app/NaviApplication.kt @@ -45,14 +45,12 @@ import com.navi.chat.base.ChatBaseActivity import com.navi.common.CommonLibManager import com.navi.common.resourcemanager.manager.ResourceManager import com.navi.common.ui.activity.BaseActivity -import com.navi.common.uitron.util.UiTronDependencyProvider import com.navi.common.utils.BiometricPromptUtils import com.navi.common.utils.CommonUtils.isQaRelease import com.navi.common.utils.Constants.ScreenLockConstants.ENABLED import com.navi.common.utils.Constants.ScreenLockConstants.IS_SCREEN_LOCK_ENABLED import com.navi.insurance.health.activity.BaseActivity as InsuranceBaseActivity import com.navi.pay.common.setup.NaviPayManager -import com.navi.uitron.UiTronSdkManager import com.naviapp.BuildConfig import com.naviapp.analytics.deeplink.DeeplinkManager import com.naviapp.analytics.utils.AlfredApiLogsProviderImpl @@ -137,7 +135,6 @@ open class NaviApplication : AlfredApiLogsManager.init(AlfredApiLogsProviderImpl()) } // Initialize SDKs - UiTronSdkManager.init(UiTronDependencyProvider(applicationContext)) PreferenceManager.init(this) NaviSDKHelper.init(naviApplication = this) registerActivityLifecycleCallbacks(this) diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index bdcfb173f5..e9ee663cbc 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -101,7 +101,7 @@ navi-adverse = "1.1.0" navi-alfred = "1.10.0" navi-guarddog = "3.3.0" navi-pulse = "1.5.0" -navi-uitron = "1.20.0" +navi-uitron = "1.20.1" navigation = "2.5.3" okhttp-bom = "4.12.0" otaliastudios-cameraview = "2.7.2" diff --git a/android/navi-common/src/main/java/com/navi/common/ui/activity/BaseActivity.kt b/android/navi-common/src/main/java/com/navi/common/ui/activity/BaseActivity.kt index 80d8b80949..3591eaa5ac 100644 --- a/android/navi-common/src/main/java/com/navi/common/ui/activity/BaseActivity.kt +++ b/android/navi-common/src/main/java/com/navi/common/ui/activity/BaseActivity.kt @@ -77,6 +77,7 @@ import com.navi.common.ui.fragment.ActionWarningFragment import com.navi.common.ui.fragment.FeedbackFragment import com.navi.common.ui.fragment.FullScreenErrorDialog import com.navi.common.ui.fragment.NewActionErrorFragment +import com.navi.common.uitron.util.UiTronDependencyProvider import com.navi.common.utils.ApiPollScheduler import com.navi.common.utils.BiometricPromptUtils import com.navi.common.utils.CommonNaviAnalytics @@ -98,6 +99,7 @@ import com.navi.common.utils.updateSessionId import com.navi.common.viewmodel.BaseVM import com.navi.common.viewmodel.FeedbackVM import com.navi.naviwidgets.models.LottieFieldData +import com.navi.uitron.UiTronSdkManager import java.lang.ref.WeakReference import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay @@ -175,6 +177,7 @@ abstract class BaseActivity : override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + initUiTronSdkManager() handleRedirection() } @@ -188,6 +191,12 @@ abstract class BaseActivity : layoutView = view } + private fun initUiTronSdkManager() { + if (!UiTronSdkManager.isInitialized()) { + UiTronSdkManager.init(UiTronDependencyProvider(applicationContext)) + } + } + private fun handleRedirection(newIntent: Intent? = null) { val intent: Intent? = newIntent ?: this.intent try { diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/BaseActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/BaseActivity.kt index ff8772bbe0..724b71bda1 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/BaseActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/BaseActivity.kt @@ -40,6 +40,7 @@ import com.navi.common.constants.VENDOR_NAVI_API import com.navi.common.model.ModuleName import com.navi.common.network.models.ErrorMessage import com.navi.common.ui.dialog.NaviLockScreenDialog +import com.navi.common.uitron.util.UiTronDependencyProvider import com.navi.common.utils.BiometricPromptUtils import com.navi.common.utils.CommonNaviAnalytics import com.navi.common.utils.Constants @@ -62,6 +63,7 @@ import com.navi.insurance.health.fragment.HomeFragment import com.navi.insurance.health.viewmodel.BaseVM import com.navi.insurance.util.ERROR_MESSAGE import com.navi.insurance.util.getGlobalErrorType +import com.navi.uitron.UiTronSdkManager import java.lang.ref.WeakReference import kotlin.collections.MutableMap import kotlin.collections.first @@ -125,6 +127,7 @@ abstract class BaseActivity : AppCompatActivity() { supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, true) analyticsHandler.setCurrentScreen(screenName) getViewModel()?.setAnalyticsHandler(analyticsHandler) + initUiTronSdkManager() handleRedirection() } @@ -137,6 +140,12 @@ abstract class BaseActivity : AppCompatActivity() { return super.dispatchTouchEvent(ev) } + private fun initUiTronSdkManager() { + if (!UiTronSdkManager.isInitialized()) { + UiTronSdkManager.init(UiTronDependencyProvider(applicationContext)) + } + } + fun getCurrentFragmentScreenName(): String { return try { if (supportFragmentManager.backStackEntryCount > 0) {