From 5ac02ecf5b5a50ed970aa0af69596908e919dccb Mon Sep 17 00:00:00 2001 From: Tangem Date: Sat, 9 Jun 2018 10:28:26 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../presentation/activity/MainActivity.java | 35 ++++++++++--------- .../presentation/fragment/LoadedWallet.java | 7 +++- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.java b/app/src/main/java/com/tangem/presentation/activity/MainActivity.java index 205925140c..1a29d5a3e8 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.java +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.nfc.NfcAdapter; +import android.nfc.Tag; import android.os.Bundle; import android.support.design.widget.FloatingActionButton; import android.support.v7.app.AppCompatActivity; @@ -113,13 +114,13 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI hideCleanButton(); // NFC -// Intent intent = getIntent(); -// if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED.equals(intent.getAction()) || NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction()))) { -// Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG); -// if (tag != null && onNFCReaderCallback != null) { -// onNFCReaderCallback.onTagDiscovered(tag); -// } -// } + Intent intent = getIntent(); + if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED.equals(intent.getAction()) || NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction()))) { + Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG); + if (tag != null && onNFCReaderCallback != null) { + onNFCReaderCallback.onTagDiscovered(tag); + } + } // check if device root RootBeer rootBeer = new RootBeer(this); @@ -127,16 +128,16 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI new RootFoundDialog().show(getFragmentManager(), RootFoundDialog.TAG); } -// @Override -// protected void onNewIntent(Intent intent) { -// super.onNewIntent(intent); -// if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED.equals(intent.getAction()) || NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction()))) { -// Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG); -// if (tag != null && onNFCReaderCallback != null) { -// onNFCReaderCallback.onTagDiscovered(tag); -// } -// } -// } + @Override + protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); + if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED.equals(intent.getAction()) || NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction()))) { + Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG); + if (tag != null && onNFCReaderCallback != null) { + onNFCReaderCallback.onTagDiscovered(tag); + } + } + } @Override public boolean onKeyDown(int keycode, KeyEvent e) { diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java index 15163457ce..7510508c17 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java @@ -709,7 +709,12 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre tvWallet.setOnClickListener(v12 -> doShareWallet(false)); ivQR.setOnClickListener(v1 -> doShareWallet(true)); - tvLoad.setOnClickListener(v1 -> doShareWallet(true)); + tvLoad.setOnClickListener(v1 -> { + Intent intent = new Intent(Intent.ACTION_VIEW, Objects.requireNonNull(CoinEngineFactory.Create(mCard.getBlockchain())).getShareWalletURI(mCard)); + intent.addCategory(Intent.CATEGORY_DEFAULT); + startActivity(intent); + } + ); tvPurge.setOnClickListener(v16 -> showMenu(tvPurge)); return v;