GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2019-10-16 10:41:29 +03:00
parent 64ded4f72e
commit 903ebe797f
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/tangem/ui/activity/MainActivity.kt
View file

@ -1,5 +1,3 @@
@file:Suppress("ObsoleteExperimentalCoroutines")
package com.tangem.ui.activity
import android.content.Context
@ -17,6 +15,7 @@ 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
@ -40,7 +39,7 @@ 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).navigate(R.id.main)
findNavController(R.id.nav_host_fragment).navigateSafely(R.id.main)
onTagDiscovered(tag)
}
}

9
app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt
View file

@ -11,6 +11,7 @@ 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() {
@ -74,13 +75,7 @@ abstract class BaseFragment : Fragment() {
}
protected fun navigateToDestination(@IdRes destination: Int, data: Bundle? = null) {
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)
}
findNavController(this).navigateSafely(destination, data)
}
protected fun navigateBackWithResult(resultCode: Int, data: Bundle? = null,