From 8db844e7dbe3714df3bb70220774a007e999cd41 Mon Sep 17 00:00:00 2001
From: Soumya Ranjan Patra <soumya.ranjan@navi.com>
Date: Fri, 29 Nov 2024 16:18:27 +0530
Subject: [PATCH] Revert "NTP-12537 | branch concurrent modification fix by
 bypassing the old intent state" (#13884)

---
 .../deeplinkmanagement/ui/DeeplinkManagementActivity.kt  | 9 ---------
 .../firebaseremoteconfig/FirebaseRemoteConfigHelper.kt   | 2 --
 .../src/main/res/xml/default_remote_config.xml           | 4 ----
 3 files changed, 15 deletions(-)

diff --git a/android/app/src/main/java/com/naviapp/deeplinkmanagement/ui/DeeplinkManagementActivity.kt b/android/app/src/main/java/com/naviapp/deeplinkmanagement/ui/DeeplinkManagementActivity.kt
index 41a081d9d6..21b473cbf6 100644
--- a/android/app/src/main/java/com/naviapp/deeplinkmanagement/ui/DeeplinkManagementActivity.kt
+++ b/android/app/src/main/java/com/naviapp/deeplinkmanagement/ui/DeeplinkManagementActivity.kt
@@ -45,7 +45,6 @@ import com.naviapp.utils.Constants.DEEPLINK
 import com.naviapp.utils.Constants.DEFAULT_DEEPLINK_RESOLVE_WAIT_TIME
 import dagger.Lazy
 import dagger.hilt.android.AndroidEntryPoint
-import io.branch.referral.Branch
 import javax.inject.Inject
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -70,14 +69,6 @@ class DeeplinkManagementActivity : BaseLauncherActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (
-            FirebaseRemoteConfigHelper.getBoolean(
-                FirebaseRemoteConfigHelper.BRANCH_BYPASS_CURRENT_ACTIVITY_INTENT_STATE,
-                false
-            )
-        ) {
-            Branch.enableBypassCurrentActivityIntentState()
-        }
         if (BaseUtils.isUserLoggedIn().not()) {
             navigateToLogin()
         }
diff --git a/android/navi-common/src/main/java/com/navi/common/firebaseremoteconfig/FirebaseRemoteConfigHelper.kt b/android/navi-common/src/main/java/com/navi/common/firebaseremoteconfig/FirebaseRemoteConfigHelper.kt
index 0dd7048e36..8b47ac8c06 100644
--- a/android/navi-common/src/main/java/com/navi/common/firebaseremoteconfig/FirebaseRemoteConfigHelper.kt
+++ b/android/navi-common/src/main/java/com/navi/common/firebaseremoteconfig/FirebaseRemoteConfigHelper.kt
@@ -230,8 +230,6 @@ object FirebaseRemoteConfigHelper {
 
     // CRM
     const val CRM_WEB_VIEW_ENABLED = "CRM_WEB_VIEW_ENABLED"
-    const val BRANCH_BYPASS_CURRENT_ACTIVITY_INTENT_STATE =
-        "BRANCH_BYPASS_CURRENT_ACTIVITY_INTENT_STATE"
 
     private fun getFirebaseRemoteConfig(): FirebaseRemoteConfig {
         val remoteConfig = Firebase.remoteConfig
diff --git a/android/navi-common/src/main/res/xml/default_remote_config.xml b/android/navi-common/src/main/res/xml/default_remote_config.xml
index a640b2d2e3..a7d589a735 100644
--- a/android/navi-common/src/main/res/xml/default_remote_config.xml
+++ b/android/navi-common/src/main/res/xml/default_remote_config.xml
@@ -610,8 +610,4 @@
         <key>UPI_LITE_MANDATE_INFO_IN_DB_REFRESH_MIN_TIMESTAMP</key>
         <value>86400000</value>
     </entry>
-    <entry>
-        <key>BRANCH_BYPASS_CURRENT_ACTIVITY_INTENT_STATE</key>
-        <value>false</value>
-    </entry>
 </defaultsMap>
\ No newline at end of file