From e12bf31b938887efc5f7687a80b35bf1e01b08c9 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 30 Oct 2019 17:13:27 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../java/com/tangem/ui/activity/MainActivity.kt  | 14 ++++++++++++--
 .../java/com/tangem/ui/fragment/BaseFragment.kt  |  9 +++++++--
 .../java/com/tangem/util/NavigationExtensions.kt | 16 ----------------
 3 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 app/src/main/java/com/tangem/util/NavigationExtensions.kt

diff --git a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt
index b68c82ab28..239286c65f 100644
--- a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt
@@ -6,6 +6,7 @@ import android.content.pm.ActivityInfo
 import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.os.Bundle
+import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProviders
 import androidx.navigation.findNavController
@@ -15,7 +16,6 @@ import com.tangem.di.ToastHelper
 import com.tangem.tangem_sdk.android.nfc.NfcLifecycleObserver
 import com.tangem.tangem_sdk.android.reader.NfcManager
 import com.tangem.ui.dialog.RootFoundDialog
-import com.tangem.util.navigateSafely
 import com.tangem.wallet.BuildConfig
 import com.tangem.wallet.R
 import javax.inject.Inject
@@ -39,12 +39,22 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
         if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED == intent.action || NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action)) {
             val tag = intent.getParcelableExtra<Tag>(NfcAdapter.EXTRA_TAG)
             if (tag != null) {
-                findNavController(R.id.nav_host_fragment).navigateSafely(R.id.main)
+                navigateSafelyToMainFragment()
                 onTagDiscovered(tag)
             }
         }
     }
 
+    private fun navigateSafelyToMainFragment() {
+        try {
+            findNavController(R.id.nav_host_fragment).navigate(R.id.main)
+        } catch (e: IllegalArgumentException) {
+            Log.w(this::class.java.simpleName, e.message)
+        } catch (e: IllegalStateException) {
+            Log.w(this::class.java.simpleName, e.message)
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
diff --git a/app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt b/app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt
index 80bbf19131..776d159e6b 100644
--- a/app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt
@@ -11,7 +11,6 @@ import androidx.navigation.fragment.NavHostFragment.findNavController
 import com.tangem.ui.activity.MainActivity
 import com.tangem.ui.navigation.NavigationResult
 import com.tangem.ui.navigation.NavigationResultListener
-import com.tangem.util.navigateSafely
 
 abstract class BaseFragment : Fragment() {
 
@@ -75,7 +74,13 @@ abstract class BaseFragment : Fragment() {
     }
 
     protected fun navigateToDestination(@IdRes destination: Int, data: Bundle? = null) {
-        findNavController(this).navigateSafely(destination, data)
+        try {
+            findNavController(this).navigate(destination, data)
+        } catch (e: IllegalArgumentException) {
+            Log.w(this::class.java.simpleName, e.message)
+        } catch (e: IllegalStateException) {
+            Log.w(this::class.java.simpleName, e.message)
+        }
     }
 
     protected fun navigateBackWithResult(resultCode: Int, data: Bundle? = null,
diff --git a/app/src/main/java/com/tangem/util/NavigationExtensions.kt b/app/src/main/java/com/tangem/util/NavigationExtensions.kt
deleted file mode 100644
index ff4df71b13..0000000000
--- a/app/src/main/java/com/tangem/util/NavigationExtensions.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.tangem.util
-
-import android.os.Bundle
-import android.util.Log
-import androidx.annotation.IdRes
-import androidx.navigation.NavController
-
-fun NavController.navigateSafely(@IdRes destination: Int, data: Bundle? = null) {
-    try {
-        this.navigate(destination, data)
-    } catch (e: IllegalArgumentException) {
-        Log.w(this::class.java.simpleName, e.message)
-    } catch (e: IllegalStateException) {
-        Log.w(this::class.java.simpleName, e.message)
-    }
-}
\ No newline at end of file