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-31 06:23:02 +00:00
commit 23b13c3269
6 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/tangem/App.kt
View file

@ -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) {

2
app/src/main/java/com/tangem/data/Logger.java
View file

@ -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);

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

@ -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)

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

@ -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,

2
app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
View file

@ -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()

16
app/src/main/java/com/tangem/util/NavigationExtensions.kt
View file

@ -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)
}
}