From 45862ce84f1f1f8e00eb16d650fbe5df2f688dea Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 30 Oct 2019 17:03:18 +0300 Subject: [PATCH 1/3] Updated on 2026-08-14 --- .../java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt index b2ef26de9b..461dff5a5f 100644 --- a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt @@ -579,7 +579,7 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte } fun updateViews() { - if (activity == null) return + if (activity == null || this.view == null) return if (timerHideErrorAndMessage != null) { timerHideErrorAndMessage!!.cancel() From 7e7ec74d8f2481dcf601773e11fe9fa9811d3535 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 30 Oct 2019 17:05:32 +0300 Subject: [PATCH 2/3] Updated on 2026-08-14 --- app/src/main/java/com/tangem/App.kt | 1 + app/src/main/java/com/tangem/data/Logger.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/App.kt b/app/src/main/java/com/tangem/App.kt index 5ebc7f51d1..9c718e0f1d 100644 --- a/app/src/main/java/com/tangem/App.kt +++ b/app/src/main/java/com/tangem/App.kt @@ -61,6 +61,7 @@ class App : Application() { pendingTransactionsStorage = PendingTransactionsStorage(applicationContext) if (BuildConfig.DEBUG) { + Runtime.getRuntime().exec("logcat -G 16M") com.tangem.tangem_card.util.Log.setLogger( object : com.tangem.tangem_card.util.LoggerInterface { override fun i(logTag: String, message: String) { diff --git a/app/src/main/java/com/tangem/data/Logger.java b/app/src/main/java/com/tangem/data/Logger.java index 16dcf0dfea..8cf42d6737 100644 --- a/app/src/main/java/com/tangem/data/Logger.java +++ b/app/src/main/java/com/tangem/data/Logger.java @@ -21,7 +21,7 @@ public class Logger { if (f.createNewFile()) { f.setReadable(true); FileWriter fileWriter = new FileWriter(f, true); - Process process = Runtime.getRuntime().exec("logcat -d -b main -v time"); + Process process = Runtime.getRuntime().exec("logcat -d -v time"); try { InputStream is = process.getInputStream(); InputStreamReader isr = new InputStreamReader(is); From e12bf31b938887efc5f7687a80b35bf1e01b08c9 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 30 Oct 2019 17:13:27 +0300 Subject: [PATCH 3/3] 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(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