Updated on 2026-08-14

This commit is contained in:
Tangem 2018-06-09 10:28:26 +03:00
parent 1c1cd2a802
commit 5ac02ecf5b
2 changed files with 24 additions and 18 deletions

View file

@ -4,6 +4,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.nfc.NfcAdapter; import android.nfc.NfcAdapter;
import android.nfc.Tag;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
@ -113,13 +114,13 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
hideCleanButton(); hideCleanButton();
// NFC // NFC
// Intent intent = getIntent(); Intent intent = getIntent();
// if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED.equals(intent.getAction()) || NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction()))) { if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED.equals(intent.getAction()) || NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction()))) {
// Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG); Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
// if (tag != null && onNFCReaderCallback != null) { if (tag != null && onNFCReaderCallback != null) {
// onNFCReaderCallback.onTagDiscovered(tag); onNFCReaderCallback.onTagDiscovered(tag);
// } }
// } }
// check if device root // check if device root
RootBeer rootBeer = new RootBeer(this); RootBeer rootBeer = new RootBeer(this);
@ -127,16 +128,16 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
new RootFoundDialog().show(getFragmentManager(), RootFoundDialog.TAG); new RootFoundDialog().show(getFragmentManager(), RootFoundDialog.TAG);
} }
// @Override @Override
// protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
// super.onNewIntent(intent); super.onNewIntent(intent);
// if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED.equals(intent.getAction()) || NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction()))) { if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED.equals(intent.getAction()) || NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction()))) {
// Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG); Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
// if (tag != null && onNFCReaderCallback != null) { if (tag != null && onNFCReaderCallback != null) {
// onNFCReaderCallback.onTagDiscovered(tag); onNFCReaderCallback.onTagDiscovered(tag);
// } }
// } }
// } }
@Override @Override
public boolean onKeyDown(int keycode, KeyEvent e) { public boolean onKeyDown(int keycode, KeyEvent e) {

View file

@ -709,7 +709,12 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
tvWallet.setOnClickListener(v12 -> doShareWallet(false)); tvWallet.setOnClickListener(v12 -> doShareWallet(false));
ivQR.setOnClickListener(v1 -> doShareWallet(true)); 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)); tvPurge.setOnClickListener(v16 -> showMenu(tvPurge));
return v; return v;