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 2018-05-29 21:45:37 +03:00
parent 61c4f7047d
commit 52ce16bb09
86 changed files with 9207 additions and 9295 deletions
Download patch file Download diff file Expand all files Collapse all files

102
app/src/main/java/com/tangem/presentation/fragment/LoadedWalletActivityFragment.java → app/src/main/java/com/tangem/presentation/fragment/LoadedWalletFragment.java
View file

@ -39,33 +39,33 @@ import com.google.zxing.WriterException;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.tangem.data.network.request.ElectrumRequest;
import com.tangem.domain.cardReader.CardProtocol;
import com.tangem.domain.cardReader.NfcManager;
import com.tangem.domain.cardReader.Util;
import com.tangem.domain.wallet.TangemCard;
import com.tangem.util.Util;
import com.tangem.presentation.activity.CreateNewWalletActivity;
import com.tangem.presentation.activity.PreparePaymentActivity;
import com.tangem.presentation.activity.PurgeActivity;
import com.tangem.presentation.activity.RequestPINActivity;
import com.tangem.presentation.activity.SwapPINActivity;
import com.tangem.presentation.activity.VerifyCardActivity;
import com.tangem.wallet.BTCUtils;
import com.tangem.wallet.BitcoinException;
import com.tangem.wallet.Blockchain;
import com.tangem.wallet.CoinEngine;
import com.tangem.wallet.CoinEngineFactory;
import com.tangem.data.network.request.Electrum_Request;
import com.tangem.data.network.task.Electrum_Task;
import com.tangem.domain.wallet.BTCUtils;
import com.tangem.domain.wallet.BitcoinException;
import com.tangem.domain.wallet.Blockchain;
import com.tangem.domain.wallet.CoinEngine;
import com.tangem.domain.wallet.CoinEngineFactory;
import com.tangem.data.network.task.ElectrumTask;
import com.tangem.data.network.request.ExchangeRequest;
import com.tangem.data.network.task.ExchangeTask;
import com.tangem.wallet.Infura_Request;
import com.tangem.data.network.task.Infura_Task;
import com.tangem.wallet.LastSignStorage;
import com.tangem.domain.wallet.Infura_Request;
import com.tangem.data.network.task.InfuraTask;
import com.tangem.domain.wallet.LastSignStorage;
import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog;
import com.tangem.wallet.PINStorage;
import com.tangem.domain.wallet.PINStorage;
import com.tangem.wallet.R;
import com.tangem.wallet.SharedData;
import com.tangem.wallet.Tangem_Card;
import com.tangem.wallet.VerifyCardTask;
import com.tangem.domain.wallet.SharedData;
import com.tangem.data.network.task.VerifyCardTask;
import com.tangem.presentation.dialog.WaitSecurityDelayDialog;
import org.json.JSONArray;
@ -84,7 +84,7 @@ import static android.content.Context.CLIPBOARD_SERVICE;
/**
* A placeholder fragment containing a simple view.
*/
public class LoadedWalletActivityFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener, NfcAdapter.ReaderCallback, CardProtocol.Notifications {
public class LoadedWalletFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener, NfcAdapter.ReaderCallback, CardProtocol.Notifications {
private static final int REQUEST_CODE_SEND_PAYMENT = 1;
@ -95,7 +95,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
private static final int REQUEST_CODE_ENTER_NEW_PIN2 = 6;
private static final int REQUEST_CODE_REQUEST_PIN2_FOR_SWAP_PIN = 7;
private static final int REQUEST_CODE_SWAP_PIN = 8;
Tangem_Card mCard;
TangemCard mCard;
TextView tvCardID, tvBalance, tvOffline, tvBalanceEquivalent, tvWallet, tvInputs, lbInputs, tvOutputs, tvSend, tvPurge, tvError, tvMessage, tvIssuer, tvIssuerData, tvBlockchain, tvLastInput, tvLastOutput, lbLastOutput, tvValidationNode;
TextView tvHeader, tvCaution;
ImageView imgLookup;
@ -110,7 +110,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
private VerifyCardTask verifyCardTask = null;
private int requestPIN2Count = 0;
public LoadedWalletActivityFragment() {
public LoadedWalletFragment() {
}
@ -136,14 +136,14 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
String nodeAddress = engine.GetNextNode(mCard);
int nodePort = engine.GetNextNodePort(mCard);
UpdateWalletInfoTask connectTaskEx = new UpdateWalletInfoTask(nodeAddress, nodePort, data);
connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, Electrum_Request.CheckBalance(mCard.getWallet()));
connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.CheckBalance(mCard.getWallet()));
}
String nodeAddress = engine.GetNode(mCard);
int nodePort = engine.GetNodePort(mCard);
UpdateWalletInfoTask updateWalletInfoTask = new UpdateWalletInfoTask(nodeAddress, nodePort, data);
updateTasks.add(updateWalletInfoTask);
updateWalletInfoTask.execute(Electrum_Request.ListUnspent(mCard.getWallet()), Electrum_Request.ListHistory(mCard.getWallet()));
updateWalletInfoTask.execute(ElectrumRequest.ListUnspent(mCard.getWallet()), ElectrumRequest.ListHistory(mCard.getWallet()));
RateInfoTask taskRate = new RateInfoTask();
ExchangeRequest rate = ExchangeRequest.GetRate(mCard.getWallet(), "bitcoin", "bitcoin");
@ -156,7 +156,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
String nodeAddress = engine.GetNextNode(mCard);
int nodePort = engine.GetNextNodePort(mCard);
UpdateWalletInfoTask connectTaskEx = new UpdateWalletInfoTask(nodeAddress, nodePort, data);
connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, Electrum_Request.CheckBalance(mCard.getWallet()));
connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.CheckBalance(mCard.getWallet()));
}
String nodeAddress = engine.GetNode(mCard);
@ -164,7 +164,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
UpdateWalletInfoTask updateWalletInfoTask = new UpdateWalletInfoTask(nodeAddress, nodePort, data);
updateTasks.add(updateWalletInfoTask);
updateWalletInfoTask.execute(Electrum_Request.ListUnspent(mCard.getWallet()), Electrum_Request.ListHistory(mCard.getWallet()));
updateWalletInfoTask.execute(ElectrumRequest.ListUnspent(mCard.getWallet()), ElectrumRequest.ListHistory(mCard.getWallet()));
RateInfoTask taskRate = new RateInfoTask();
ExchangeRequest rate = ExchangeRequest.GetRate(mCard.getWallet(), "bitcoin-cash", "bitcoin-cash");
@ -263,7 +263,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
mSwipeRefreshLayout = v.findViewById(R.id.swipe_container);
mSwipeRefreshLayout.setOnRefreshListener(this);
mCard = new Tangem_Card(getActivity().getIntent().getStringExtra("UID"));
mCard = new TangemCard(getActivity().getIntent().getStringExtra("UID"));
mCard.LoadFromBundle(getActivity().getIntent().getExtras().getBundle("Card"));
tvCardID = v.findViewById(R.id.tvCardID);
@ -784,14 +784,14 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
int nodePort = engine.GetNodePort(mCard);
UpdateWalletInfoTask connectTask = new UpdateWalletInfoTask(nodeAddress, nodePort);
connectTask.execute(Electrum_Request.Broadcast(mCard.getWallet(), tx));
connectTask.execute(ElectrumRequest.Broadcast(mCard.getWallet(), tx));
}
else if (mCard.getBlockchain() == Blockchain.BitcoinCash ||mCard.getBlockchain() == Blockchain.BitcoinCashTestNet) {
String nodeAddress = engine.GetNode(mCard);
int nodePort = engine.GetNodePort(mCard);
UpdateWalletInfoTask connectTask = new UpdateWalletInfoTask(nodeAddress, nodePort);
connectTask.execute(Electrum_Request.Broadcast(mCard.getWallet(), tx));
connectTask.execute(ElectrumRequest.Broadcast(mCard.getWallet(), tx));
}
}
@ -872,7 +872,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
getActivity().finish();
} else {
if (data != null && data.getExtras().containsKey("UID") && data.getExtras().containsKey("Card")) {
Tangem_Card updatedCard = new Tangem_Card(data.getStringExtra("UID"));
TangemCard updatedCard = new TangemCard(data.getStringExtra("UID"));
updatedCard.LoadFromBundle(data.getBundleExtra("Card"));
mCard = updatedCard;
}
@ -914,7 +914,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
getActivity().finish();
} else {
if (data != null && data.getExtras().containsKey("UID") && data.getExtras().containsKey("Card")) {
Tangem_Card updatedCard = new Tangem_Card(data.getStringExtra("UID"));
TangemCard updatedCard = new TangemCard(data.getStringExtra("UID"));
updatedCard.LoadFromBundle(data.getBundleExtra("Card"));
mCard = updatedCard;
}
@ -949,7 +949,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
if (data != null) {
if (data.getExtras().containsKey("UID") && data.getExtras().containsKey("Card")) {
Tangem_Card updatedCard = new Tangem_Card(data.getStringExtra("UID"));
TangemCard updatedCard = new TangemCard(data.getStringExtra("UID"));
updatedCard.LoadFromBundle(data.getBundleExtra("Card"));
mCard = updatedCard;
}
@ -1054,7 +1054,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
UpdateViews();
}
private class ETHRequestTask extends Infura_Task {
private class ETHRequestTask extends InfuraTask {
ETHRequestTask(Blockchain blockchain) {
super(blockchain);
}
@ -1316,7 +1316,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
}
}
private class UpdateWalletInfoTask extends Electrum_Task {
private class UpdateWalletInfoTask extends ElectrumTask {
public UpdateWalletInfoTask(String host, int port) {
super(host, port);
}
@ -1339,17 +1339,17 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
}
@Override
protected void onPostExecute(List<Electrum_Request> requests) {
protected void onPostExecute(List<ElectrumRequest> requests) {
super.onPostExecute(requests);
Log.i("RequestWalletInfoTask", "onPostExecute[" + String.valueOf(updateTasks.size()) + "]");
updateTasks.remove(this);
CoinEngine engine = CoinEngineFactory.Create(mCard.getBlockchain());
for (Electrum_Request request : requests) {
for (ElectrumRequest request : requests) {
try {
if (request.error == null) {
if (request.isMethod(Electrum_Request.METHOD_GetBalance)) {
if (request.isMethod(ElectrumRequest.METHOD_GetBalance)) {
try {
String mWalletAddress = request.getParams().getString(0);
Long confBalance = request.getResult().getLong("confirmed");
@ -1379,7 +1379,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
engine.SwitchNode(mCard);
}
}
} else if (request.isMethod(Electrum_Request.METHOD_SendTransaction)) {
} else if (request.isMethod(ElectrumRequest.METHOD_SendTransaction)) {
try {
String hashTX = request.getResultString();
@ -1403,7 +1403,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
ErrorOnUpdate("Failed to send transaction. Try again.");
engine.SwitchNode(mCard);
}
} else if (request.isMethod(Electrum_Request.METHOD_ListUnspent)) {
} else if (request.isMethod(ElectrumRequest.METHOD_ListUnspent)) {
try {
String mWalletAddress = request.getParams().getString(0);
@ -1412,7 +1412,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
mCard.getUnspentTransactions().clear();
for (int i = 0; i < jsUnspentArray.length(); i++) {
JSONObject jsUnspent = jsUnspentArray.getJSONObject(i);
Tangem_Card.UnspentTransaction trUnspent = new Tangem_Card.UnspentTransaction();
TangemCard.UnspentTransaction trUnspent = new TangemCard.UnspentTransaction();
trUnspent.txID = jsUnspent.getString("tx_hash");
trUnspent.Amount = jsUnspent.getInt("value");
trUnspent.Height = jsUnspent.getInt("height");
@ -1435,8 +1435,8 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
updateTasks.add(updateWalletInfoTask);
updateWalletInfoTask.execute(Electrum_Request.GetHeader(mWalletAddress, String.valueOf(height)),
Electrum_Request.GetTransaction(mWalletAddress, hash));
updateWalletInfoTask.execute(ElectrumRequest.GetHeader(mWalletAddress, String.valueOf(height)),
ElectrumRequest.GetTransaction(mWalletAddress, hash));
}
}
} catch (JSONException e) {
@ -1444,7 +1444,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
ErrorOnUpdate(e.toString());
engine.SwitchNode(mCard);
}
} else if (request.isMethod(Electrum_Request.METHOD_GetHistory)) {
} else if (request.isMethod(ElectrumRequest.METHOD_GetHistory)) {
try {
String mWalletAddress = request.getParams().getString(0);
@ -1453,7 +1453,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
mCard.getHistoryTransactions().clear();
for (int i = 0; i < jsHistoryArray.length(); i++) {
JSONObject jsUnspent = jsHistoryArray.getJSONObject(i);
Tangem_Card.HistoryTransaction trHistory = new Tangem_Card.HistoryTransaction();
TangemCard.HistoryTransaction trHistory = new TangemCard.HistoryTransaction();
trHistory.txID = jsUnspent.getString("tx_hash");
trHistory.Height = jsUnspent.getInt("height");
mCard.getHistoryTransactions().add(trHistory);
@ -1475,8 +1475,8 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
UpdateWalletInfoTask updateWalletInfoTask = new UpdateWalletInfoTask(nodeAddress, nodePort);
updateTasks.add(updateWalletInfoTask);
updateWalletInfoTask.execute(Electrum_Request.GetHeader(mWalletAddress, String.valueOf(height)),
Electrum_Request.GetTransaction(mWalletAddress, hash));
updateWalletInfoTask.execute(ElectrumRequest.GetHeader(mWalletAddress, String.valueOf(height)),
ElectrumRequest.GetTransaction(mWalletAddress, hash));
}
}
@ -1485,12 +1485,12 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
ErrorOnUpdate(e.toString());
engine.SwitchNode(mCard);
}
} else if (request.isMethod(Electrum_Request.METHOD_GetHeader)) {
} else if (request.isMethod(ElectrumRequest.METHOD_GetHeader)) {
try {
JSONObject jsHeader = request.getResult();
try {
mCard.getHaedersInfo();
mCard.UpdateHeaderInfo(new Tangem_Card.HeaderInfo(
mCard.UpdateHeaderInfo(new TangemCard.HeaderInfo(
jsHeader.getInt("block_height"),
jsHeader.getInt("timestamp")));
} catch (JSONException e) {
@ -1506,21 +1506,21 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
engine.SwitchNode(mCard);
}
} else if (request.isMethod(Electrum_Request.METHOD_GetTransaction)) {
} else if (request.isMethod(ElectrumRequest.METHOD_GetTransaction)) {
try {
String txHash = request.TxHash;
String raw = request.getResultString();
List<Tangem_Card.UnspentTransaction> listTx = mCard.getUnspentTransactions();
for (Tangem_Card.UnspentTransaction tx : listTx) {
List<TangemCard.UnspentTransaction> listTx = mCard.getUnspentTransactions();
for (TangemCard.UnspentTransaction tx : listTx) {
if (tx.txID.equals(txHash)) {
tx.Raw = raw;
}
}
List<Tangem_Card.HistoryTransaction> listHTx = mCard.getHistoryTransactions();
for (Tangem_Card.HistoryTransaction tx : listHTx) {
List<TangemCard.HistoryTransaction> listHTx = mCard.getHistoryTransactions();
for (TangemCard.HistoryTransaction tx : listHTx) {
if (tx.txID.equals(txHash)) {
tx.Raw = raw;
try {
@ -1529,7 +1529,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
boolean isOur = false;
for (byte[] hash : prevHashes) {
String checkID = BTCUtils.toHex(hash);
for (Tangem_Card.HistoryTransaction txForCheck : listHTx) {
for (TangemCard.HistoryTransaction txForCheck : listHTx) {
if (txForCheck.txID == checkID) {
isOur = true;
}
@ -1587,7 +1587,7 @@ public class LoadedWalletActivityFragment extends Fragment implements SwipeRefre
public static class PINSwapWarningDialog extends DialogFragment {
LoadedWalletActivityFragment activityFragment = null;
LoadedWalletFragment activityFragment = null;
String message;
@Override

94
app/src/main/java/com/tangem/presentation/fragment/MainActivityFragment.java → app/src/main/java/com/tangem/presentation/fragment/MainFragment.java
View file

@ -24,28 +24,28 @@ import android.view.ViewGroup;
import android.widget.ProgressBar;
import android.widget.Toast;
import com.tangem.data.network.request.ElectrumRequest;
import com.tangem.domain.cardReader.CardProtocol;
import com.tangem.domain.cardReader.NfcManager;
import com.tangem.domain.cardReader.Util;
import com.tangem.domain.wallet.TangemCard;
import com.tangem.util.Util;
import com.tangem.presentation.activity.EmptyWalletActivity;
import com.tangem.presentation.activity.LoadedWalletActivity;
import com.tangem.presentation.activity.MainActivity;
import com.tangem.presentation.activity.RequestPINActivity;
import com.tangem.wallet.Blockchain;
import com.tangem.domain.wallet.Blockchain;
import com.tangem.presentation.adapter.CardListAdapter;
import com.tangem.wallet.CoinEngine;
import com.tangem.wallet.CoinEngineFactory;
import com.tangem.data.network.request.Electrum_Request;
import com.tangem.data.network.task.Electrum_Task;
import com.tangem.domain.wallet.CoinEngine;
import com.tangem.domain.wallet.CoinEngineFactory;
import com.tangem.data.network.task.ElectrumTask;
import com.tangem.data.network.request.ExchangeRequest;
import com.tangem.data.network.task.ExchangeTask;
import com.tangem.wallet.Infura_Request;
import com.tangem.data.network.task.Infura_Task;
import com.tangem.domain.wallet.Infura_Request;
import com.tangem.data.network.task.InfuraTask;
import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog;
import com.tangem.wallet.PINStorage;
import com.tangem.domain.wallet.PINStorage;
import com.tangem.wallet.R;
import com.tangem.wallet.SharedData;
import com.tangem.wallet.Tangem_Card;
import com.tangem.domain.wallet.SharedData;
import com.tangem.presentation.dialog.WaitSecurityDelayDialog;
import org.json.JSONArray;
@ -60,14 +60,14 @@ import java.util.List;
/**
* A placeholder fragment containing a simple view.
*/
public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderCallback, CardListAdapter.UiCallbacks, CardProtocol.Notifications, MainActivity.OnCardsClean {
public class MainFragment extends Fragment implements NfcAdapter.ReaderCallback, CardListAdapter.UiCallbacks, CardProtocol.Notifications, MainActivity.OnCardsClean {
private static final int REQUEST_CODE_SHOW_CARD_ACTIVITY = 1;
private static final int REQUEST_CODE_ENTER_PIN_ACTIVITY = 2;
private static final int REQUEST_CODE_REQUEST_CAMERA_PERMISSIONS = 3;
private NfcManager mNfcManager;
private ArrayList<String> slCardUIDs = new ArrayList<>();
private static final String logTag = "MainActivityFragment";
private static final String logTag = "MainFragment";
private ProgressBar progressBar;
private CardListAdapter mCardListAdapter;
@ -80,7 +80,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
private SwipeRefreshLayout mSwipeRefreshLayout; //TODO: tmp
List<RequestWalletInfoTask> requestTasks = new ArrayList<>();
public MainActivityFragment() {
public MainFragment() {
}
@Override
@ -237,7 +237,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
super.onStop();
}
public void refreshCard(Tangem_Card card) {
public void refreshCard(TangemCard card) {
CoinEngine engine = CoinEngineFactory.Create(card.getBlockchain());
if (card.getBlockchain() == Blockchain.Ethereum || card.getBlockchain() == Blockchain.EthereumTestNet) {
ETHRequestTask task = new ETHRequestTask(card.getBlockchain());
@ -261,7 +261,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
String nodeAddress = engine.GetNextNode(card);
int nodePort = engine.GetNextNodePort(card);
RequestWalletInfoTask connectTaskEx = new RequestWalletInfoTask(nodeAddress, nodePort, data);
connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, Electrum_Request.CheckBalance(card.getWallet()));
connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.CheckBalance(card.getWallet()));
}
String nodeAddress = engine.GetNode(card);
@ -269,7 +269,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
RequestWalletInfoTask task = new RequestWalletInfoTask(nodeAddress, nodePort);
if( mSwipeRefreshLayout!=null ) mSwipeRefreshLayout.setRefreshing(true); //TODO: tmp
requestTasks.add(task);
task.execute(Electrum_Request.ListUnspent(card.getWallet()), Electrum_Request.ListHistory(card.getWallet()));
task.execute(ElectrumRequest.ListUnspent(card.getWallet()), ElectrumRequest.ListHistory(card.getWallet()));
RateInfoTask taskRate = new RateInfoTask();
ExchangeRequest rate = ExchangeRequest.GetRate(card.getWallet(), "bitcoin", "bitcoin");
taskRate.execute(rate);
@ -282,7 +282,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
String nodeAddress = engine.GetNextNode(card);
int nodePort = engine.GetNextNodePort(card);
RequestWalletInfoTask connectTaskEx = new RequestWalletInfoTask(nodeAddress, nodePort, data);
connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, Electrum_Request.CheckBalance(card.getWallet()));
connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.CheckBalance(card.getWallet()));
}
String nodeAddress = engine.GetNode(card);
@ -290,7 +290,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
RequestWalletInfoTask task = new RequestWalletInfoTask(nodeAddress, nodePort);
if( mSwipeRefreshLayout!=null ) mSwipeRefreshLayout.setRefreshing(true); //TODO: tmp
requestTasks.add(task);
task.execute(Electrum_Request.ListUnspent(card.getWallet()), Electrum_Request.ListHistory(card.getWallet()));
task.execute(ElectrumRequest.ListUnspent(card.getWallet()), ElectrumRequest.ListHistory(card.getWallet()));
RateInfoTask taskRate = new RateInfoTask();
ExchangeRequest rate = ExchangeRequest.GetRate(card.getWallet(), "bitcoin-cash", "bitcoin-cash");
taskRate.execute(rate);
@ -319,7 +319,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
}
}
public void addCard(final Tangem_Card card) {
public void addCard(final TangemCard card) {
if (mCardListAdapter != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
@ -330,7 +330,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
CoinEngine engine = CoinEngineFactory.Create(card.getBlockchain());
if (card.getStatus() == Tangem_Card.Status.Loaded) {
if (card.getStatus() == TangemCard.Status.Loaded) {
if (card.getBlockchain() == Blockchain.Ethereum || card.getBlockchain() == Blockchain.EthereumTestNet) {
ETHRequestTask task = new ETHRequestTask(card.getBlockchain());
@ -355,7 +355,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
int nodePort = engine.GetNextNodePort(card);
RequestWalletInfoTask connectTaskEx = new RequestWalletInfoTask(nodeAddress, nodePort, data);
connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, Electrum_Request.CheckBalance(card.getWallet()));
connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.CheckBalance(card.getWallet()));
}
String nodeAddress = engine.GetNode(card);
@ -365,7 +365,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
if( mSwipeRefreshLayout!=null ) mSwipeRefreshLayout.setRefreshing(true); //TODO: tmp
requestTasks.add(task);
task.execute(Electrum_Request.ListUnspent(card.getWallet()), Electrum_Request.ListHistory(card.getWallet()));
task.execute(ElectrumRequest.ListUnspent(card.getWallet()), ElectrumRequest.ListHistory(card.getWallet()));
RateInfoTask taskRate = new RateInfoTask();
ExchangeRequest rate = ExchangeRequest.GetRate(card.getWallet(), "bitcoin", "bitcoin");
taskRate.execute(rate);
@ -378,7 +378,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
int nodePort = engine.GetNextNodePort(card);
RequestWalletInfoTask connectTaskEx = new RequestWalletInfoTask(nodeAddress, nodePort, data);
connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, Electrum_Request.CheckBalance(card.getWallet()));
connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.CheckBalance(card.getWallet()));
}
String nodeAddress = engine.GetNode(card);
@ -388,7 +388,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
if( mSwipeRefreshLayout!=null ) mSwipeRefreshLayout.setRefreshing(true); //TODO: tmp
requestTasks.add(task);
task.execute(Electrum_Request.ListUnspent(card.getWallet()), Electrum_Request.ListHistory(card.getWallet()));
task.execute(ElectrumRequest.ListUnspent(card.getWallet()), ElectrumRequest.ListHistory(card.getWallet()));
RateInfoTask taskRate = new RateInfoTask();
ExchangeRequest rate = ExchangeRequest.GetRate(card.getWallet(), "bitcoin-cash", "bitcoin-cash");
taskRate.execute(rate);
@ -431,17 +431,17 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
if( mSwipeRefreshLayout!=null ) mSwipeRefreshLayout.setRefreshing(false); //TODO: tmp
String UID = cardInfo.getString("UID");
Tangem_Card card = new Tangem_Card(UID);
TangemCard card = new TangemCard(UID);
card.LoadFromBundle(cardInfo.getBundle("Card"));
Intent intent;
if (card.getStatus() == Tangem_Card.Status.Empty) {
if (card.getStatus() == TangemCard.Status.Empty) {
intent = new Intent(getActivity(), EmptyWalletActivity.class);
} else if (card.getStatus() == Tangem_Card.Status.Loaded) {
} else if (card.getStatus() == TangemCard.Status.Loaded) {
intent = new Intent(getActivity(), LoadedWalletActivity.class);
} else if (card.getStatus() == Tangem_Card.Status.NotPersonalized || card.getStatus() == Tangem_Card.Status.Purged) {
} else if (card.getStatus() == TangemCard.Status.NotPersonalized || card.getStatus() == TangemCard.Status.Purged) {
return;
} else {
intent = new Intent(getActivity(), LoadedWalletActivity.class);
@ -457,7 +457,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
// если пришло ОК
if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE_SHOW_CARD_ACTIVITY) {
if (data != null && data.getExtras().containsKey("UID")) {
final Tangem_Card card = new Tangem_Card(data.getStringExtra("UID"));
final TangemCard card = new TangemCard(data.getStringExtra("UID"));
card.LoadFromBundle(data.getBundleExtra("Card"));
if (data.getStringExtra("modification").equals("delete")) {
mCardListAdapter.removeCard(card);
@ -501,7 +501,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
private static String lastRead_UID = "";
private static ArrayList<String> lastRead_UnsuccessfullPINs = new ArrayList<>();
private static Tangem_Card.EncryptionMode lastRead_Encryption = null;
private static TangemCard.EncryptionMode lastRead_Encryption = null;
private class ReadCardInfoTask extends Thread {
@ -569,7 +569,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
if (lastRead_Encryption == null) {
// we try get supported encryption on this time
lastRead_Encryption = protocol.getCard().encryptionMode;
if (protocol.getCard().encryptionMode == Tangem_Card.EncryptionMode.None) {
if (protocol.getCard().encryptionMode == TangemCard.EncryptionMode.None) {
// default pin not accepted
lastRead_UnsuccessfullPINs.add(PINStorage.getDefaultPIN());
}
@ -594,7 +594,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
try {
protocol.setPIN(PIN);
if (protocol.getCard().encryptionMode != Tangem_Card.EncryptionMode.None) {
if (protocol.getCard().encryptionMode != TangemCard.EncryptionMode.None) {
protocol.CreateProtocolKey();
}
protocol.run_Read();
@ -752,7 +752,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
WaitSecurityDelayDialog.onReadAfterRequest(getActivity());
}
private class RequestWalletInfoTask extends Electrum_Task {
private class RequestWalletInfoTask extends ElectrumTask {
public RequestWalletInfoTask(String host, int port) {
super(host, port);
}
@ -780,18 +780,18 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
}
@Override
protected void onPostExecute(List<Electrum_Request> requests) {
protected void onPostExecute(List<ElectrumRequest> requests) {
super.onPostExecute(requests);
requestTasks.remove(this);
Log.i("RequestWalletInfoTask", "onPostExecute[" + String.valueOf(requests.size()) + "]");
CoinEngine engine = CoinEngineFactory.Create(Blockchain.Bitcoin);
for (Electrum_Request request : requests) {
for (ElectrumRequest request : requests) {
try {
if (request.error == null) {
if (request.isMethod(Electrum_Request.METHOD_GetBalance)) {
if (request.isMethod(ElectrumRequest.METHOD_GetBalance)) {
try {
Long conf = request.getResult().getLong("confirmed");
Long unconf = request.getResult().getLong("unconfirmed");
@ -817,7 +817,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
engine.SwitchNode(null);
}
}
} else if (request.isMethod(Electrum_Request.METHOD_ListUnspent)) {
} else if (request.isMethod(ElectrumRequest.METHOD_ListUnspent)) {
try {
String mWalletAddress = request.getParams().getString(0);
mCardListAdapter.UpdateWalletUnspent(mWalletAddress, request.getResultArray());
@ -831,8 +831,8 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
if (height != -1) {
RequestWalletInfoTask task = new RequestWalletInfoTask(request.Host, request.Port);
requestTasks.add(task);
task.execute(Electrum_Request.GetHeader(mWalletAddress, String.valueOf(height)),
Electrum_Request.GetTransaction(mWalletAddress, hash));
task.execute(ElectrumRequest.GetHeader(mWalletAddress, String.valueOf(height)),
ElectrumRequest.GetTransaction(mWalletAddress, hash));
}
}
} catch (JSONException e) {
@ -840,7 +840,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
FinishWithError(request.WalletAddress, e.toString());
engine.SwitchNode(null);
}
} else if (request.isMethod(Electrum_Request.METHOD_GetHistory)) {
} else if (request.isMethod(ElectrumRequest.METHOD_GetHistory)) {
try {
String mWalletAddress = request.getParams().getString(0);
mCardListAdapter.UpdateWalletHistory(mWalletAddress, request.getResultArray());
@ -855,8 +855,8 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
RequestWalletInfoTask task = new RequestWalletInfoTask(request.Host, request.Port);
requestTasks.add(task);
task.execute(Electrum_Request.GetHeader(mWalletAddress, String.valueOf(height)),
Electrum_Request.GetTransaction(mWalletAddress, hash));
task.execute(ElectrumRequest.GetHeader(mWalletAddress, String.valueOf(height)),
ElectrumRequest.GetTransaction(mWalletAddress, hash));
}
}
} catch (JSONException e) {
@ -864,7 +864,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
FinishWithError(request.WalletAddress, e.toString());
engine.SwitchNode(null);
}
} else if (request.isMethod(Electrum_Request.METHOD_GetHeader)) {
} else if (request.isMethod(ElectrumRequest.METHOD_GetHeader)) {
try {
String mWalletAddress = request.WalletAddress;
@ -875,7 +875,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
FinishWithError(request.WalletAddress, e.toString());
engine.SwitchNode(null);
}
} else if (request.isMethod(Electrum_Request.METHOD_GetTransaction)) {
} else if (request.isMethod(ElectrumRequest.METHOD_GetTransaction)) {
try {
Log.e("MainActivityFragment_TX", request.TxHash);
String mWalletAddress = request.WalletAddress;
@ -926,7 +926,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
}
private class ETHRequestTask extends Infura_Task {
private class ETHRequestTask extends InfuraTask {
ETHRequestTask(Blockchain blockchain) {
super(blockchain);
}
@ -969,7 +969,7 @@ public class MainActivityFragment extends Fragment implements NfcAdapter.ReaderC
if (l.compareTo(BigInteger.ZERO) == 0) {
mCardListAdapter.UpdateWalletBlockchain(mWalletAddress, Blockchain.Ethereum);
mCardListAdapter.AddWalletBlockchainNameToken(mWalletAddress);
Tangem_Card card = mCardListAdapter.getCardByWallet(request.WalletAddress);
TangemCard card = mCardListAdapter.getCardByWallet(request.WalletAddress);
if (card != null) {
refreshCard(card);
}

14
app/src/main/java/com/tangem/presentation/fragment/VerifyCardActivityFragment.java → app/src/main/java/com/tangem/presentation/fragment/VerifyCardFragment.java
View file

@ -16,23 +16,23 @@ import android.widget.TextView;
import android.widget.Toast;
import com.tangem.domain.cardReader.NfcManager;
import com.tangem.domain.wallet.TangemCard;
import com.tangem.wallet.R;
import com.tangem.wallet.Tangem_Card;
import java.io.IOException;
import java.util.Timer;
import java.util.TimerTask;
public class VerifyCardActivityFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener, NfcAdapter.ReaderCallback {
public class VerifyCardFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener, NfcAdapter.ReaderCallback {
Tangem_Card mCard;
TangemCard mCard;
TextView tvCardID, tvManufacturer, tvRegistrationDate, tvCardIdentity, tvLastSigned, tvRemainingSignatures, tvReusable, tvOk, tvError, tvMessage,
tvIssuer, tvIssuerData, tvFeatures, tvBlockchain, tvSignedTx, tvSigningMethod, tvFirmware, tvWalletIdentity, tvWallet;
ImageView ivBlockchain, ivPIN, ivPIN2orSecurityDelay, ivDeveloperVersion;
SwipeRefreshLayout mSwipeRefreshLayout;
private NfcManager mNfcManager;
public VerifyCardActivityFragment() {
public VerifyCardFragment() {
}
@ -53,7 +53,7 @@ public class VerifyCardActivityFragment extends Fragment implements SwipeRefresh
mSwipeRefreshLayout = v.findViewById(R.id.swipe_container);
mSwipeRefreshLayout.setOnRefreshListener(this);
mCard = new Tangem_Card(getActivity().getIntent().getStringExtra("UID"));
mCard = new TangemCard(getActivity().getIntent().getStringExtra("UID"));
mCard.LoadFromBundle(getActivity().getIntent().getExtras().getBundle("Card"));
tvCardID = v.findViewById(R.id.tvCardID);
@ -166,7 +166,7 @@ public class VerifyCardActivityFragment extends Fragment implements SwipeRefresh
tvSigningMethod.setText(mCard.getSigningMethod().getDescription());
if (mCard.getStatus() == Tangem_Card.Status.Loaded || mCard.getStatus() == Tangem_Card.Status.Purged) {
if (mCard.getStatus() == TangemCard.Status.Loaded || mCard.getStatus() == TangemCard.Status.Purged) {
tvLastSigned.setText(mCard.getLastSignedDescription());
if (mCard.getRemainingSignatures() == 0) {
@ -285,7 +285,7 @@ public class VerifyCardActivityFragment extends Fragment implements SwipeRefresh
ivDeveloperVersion.setVisibility(View.INVISIBLE);
}
if (mCard.getStatus() == Tangem_Card.Status.Loaded) {
if (mCard.getStatus() == TangemCard.Status.Loaded) {
tvWallet.setText(mCard.getShortWalletString());
if (mCard.isWalletPublicKeyValid()) {
tvWalletIdentity.setText("Possession proved");

8
app/src/main/java/com/tangem/presentation/fragment/WalletInfoFragment.java
View file

@ -21,7 +21,7 @@ import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.tangem.wallet.R;
import com.tangem.wallet.Tangem_Card;
import com.tangem.domain.wallet.TangemCard;
import java.util.Hashtable;
@ -38,7 +38,7 @@ import static android.content.Context.CLIPBOARD_SERVICE;
public class WalletInfoFragment extends Fragment {
// TODO: Rename and change types of parameters
private Tangem_Card mCard;
private TangemCard mCard;
private OnFragmentInteractionListener mListener;
@ -53,7 +53,7 @@ public class WalletInfoFragment extends Fragment {
* @return A new instance of fragment WalletInfoFragment.
*/
// TODO: Rename and change types and number of parameters
public static WalletInfoFragment newInstance(Tangem_Card card) {
public static WalletInfoFragment newInstance(TangemCard card) {
WalletInfoFragment fragment = new WalletInfoFragment();
Bundle args = new Bundle();
args.putString("UID",card.getUID());
@ -66,7 +66,7 @@ public class WalletInfoFragment extends Fragment {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
mCard = new Tangem_Card(getArguments().getString("UID"));
mCard = new TangemCard(getArguments().getString("UID"));
mCard.LoadFromBundle(getArguments());
}
}