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-30 14:05:11 +03:00
parent 8a0b654663
commit 7ab858de77
20 changed files with 129 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.java
View file

@ -34,8 +34,8 @@ import com.tangem.domain.wallet.DerEncodingUtil;
import com.tangem.data.network.task.ElectrumTask;
import com.tangem.data.network.request.FeeRequest;
import com.tangem.data.network.task.FeeTask;
import com.tangem.domain.wallet.FormatUtil;
import com.tangem.domain.wallet.Infura_Request;
import com.tangem.util.FormatUtil;
import com.tangem.data.network.request.InfuraRequest;
import com.tangem.data.network.task.InfuraTask;
import com.tangem.wallet.R;
import com.tangem.domain.wallet.SharedData;
@ -249,7 +249,7 @@ public class ConfirmPaymentActivity extends AppCompatActivity implements NfcAdap
if (mCard.getBlockchain() == Blockchain.Ethereum || mCard.getBlockchain() == Blockchain.EthereumTestNet || mCard.getBlockchain() == Blockchain.Token) {
ETHRequestTask task = new ETHRequestTask(mCard.getBlockchain());
Infura_Request req = Infura_Request.GetGasPrise(mCard.getWallet());
InfuraRequest req = InfuraRequest.GetGasPrise(mCard.getWallet());
req.setID(67);
req.setBlockchain(mCard.getBlockchain());
rgFee.setEnabled(false);
@ -532,14 +532,14 @@ public class ConfirmPaymentActivity extends AppCompatActivity implements NfcAdap
}
@Override
protected void onPostExecute(List<Infura_Request> requests) {
protected void onPostExecute(List<InfuraRequest> requests) {
super.onPostExecute(requests);
for (Infura_Request request : requests) {
for (InfuraRequest request : requests) {
try {
Long price = 0L;
if (request.error == null) {
if (request.isMethod(Infura_Request.METHOD_ETH_GetGasPrice)) {
if (request.isMethod(InfuraRequest.METHOD_ETH_GetGasPrice)) {
try {
String gasPrice = request.getResultString();
gasPrice = gasPrice.substring(2);

45
app/src/main/java/com/tangem/presentation/activity/MainActivity.java
View file

@ -65,7 +65,7 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
// }
OnCardsClean onCardsClean;
// OnCreateNFCDialog onCreateNFCDialog;
// OnCreateNFCDialog onCreateNFCDialog;
NfcAdapter.ReaderCallback onNFCReaderCallback;
FloatingActionButton fab;
@ -126,8 +126,7 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
commonInit(getApplicationContext());
TextView tvNFCHint = findViewById(R.id.tvNFCHint);
if(tvNFCHint != null)
{
if (tvNFCHint != null) {
// tvNFCHint.setText("Scan a banknote with your\n" + PhoneUtility.GetPhoneName() + "\nas shown above");
tvNFCHint.setText("Scan a banknote with your\n smartphone as shown above");
}
@ -139,16 +138,16 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
final RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) hand.getLayoutParams();
final RelativeLayout.LayoutParams lp2 = (RelativeLayout.LayoutParams) nfc.getLayoutParams();
final float dp = getResources().getDisplayMetrics().density;
final float lm = dp*(69 + antenna.X * 75);
lp.topMargin = (int) (dp*(-100 + antenna.Y * 250));
lp2.topMargin = (int) (dp*(-125 + antenna.Y * 250));
final float lm = dp * (69 + antenna.X * 75);
lp.topMargin = (int) (dp * (-100 + antenna.Y * 250));
lp2.topMargin = (int) (dp * (-125 + antenna.Y * 250));
nfc.setLayoutParams(lp2);
Animation a = new Animation() {
@Override
protected void applyTransformation(float interpolatedTime, Transformation t) {
lp.leftMargin = (int)(lm * interpolatedTime);
lp.leftMargin = (int) (lm * interpolatedTime);
hand.setLayoutParams(lp);
}
};
@ -165,15 +164,14 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
}
});
MainFragment mainFragment =(MainFragment)getSupportFragmentManager().findFragmentById(R.id.fragmentMain);
if( mainFragment.getCardListAdapter().getItemCount()>0 )
{
MainFragment mainFragment = (MainFragment) getSupportFragmentManager().findFragmentById(R.id.fragmentMain);
if (mainFragment.getCardListAdapter().getItemCount() > 0) {
showCleanButton();
}else {
} else {
hideCleanButton();
}
final RippleBackground rippleBackground=(RippleBackground)findViewById(R.id.imNFC);
final RippleBackground rippleBackground = findViewById(R.id.imNFC);
rippleBackground.startRippleAnimation();
@ -186,12 +184,11 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
}
}
public static void commonInit(Context context)
{
if( PINStorage.needInit() ) {
public static void commonInit(Context context) {
if (PINStorage.needInit()) {
PINStorage.Init(context);
}
if( LastSignStorage.needInit() ) {
if (LastSignStorage.needInit()) {
LastSignStorage.Init(context);
}
}
@ -211,7 +208,6 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
onNFCReaderCallback.onTagDiscovered(tag);
}
}
}
@Override
@ -230,8 +226,8 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.menu_main, menu);
if( BuildConfig.DEBUG ) {
for(int i=0; i<menu.size(); i++ ) menu.getItem(i).setVisible(true);
if (BuildConfig.DEBUG) {
for (int i = 0; i < menu.size(); i++) menu.getItem(i).setVisible(true);
}
return true;
}
@ -333,8 +329,9 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
PopupMenu popup = new PopupMenu(this, v);
MenuInflater inflater = popup.getMenuInflater();
inflater.inflate(R.menu.menu_main, popup.getMenu());
if( BuildConfig.DEBUG ) {
for(int i=0; i<popup.getMenu().size(); i++ ) popup.getMenu().getItem(i).setVisible(true);
if (BuildConfig.DEBUG) {
for (int i = 0; i < popup.getMenu().size(); i++)
popup.getMenu().getItem(i).setVisible(true);
}
popup.setOnMenuItemClickListener(this);
popup.show();
@ -386,7 +383,6 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
case R.id.about:
showLogoActivity();
return true;
}
return super.onOptionsItemSelected(item);
@ -394,7 +390,7 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
private void showLogoActivity() {
Intent intent = new Intent(getBaseContext(), LogoActivity.class);
intent.putExtra("skipAutoHide",true);
intent.putExtra("skipAutoHide", true);
startActivity(intent);
}
@ -409,5 +405,4 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI
intent.putExtra("PIN2", true);
startActivity(intent);
}
}
}

2
app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.java
View file

@ -21,7 +21,7 @@ import com.tangem.domain.cardReader.NfcManager;
import com.tangem.domain.wallet.Blockchain;
import com.tangem.domain.wallet.CoinEngine;
import com.tangem.domain.wallet.CoinEngineFactory;
import com.tangem.domain.wallet.FormatUtil;
import com.tangem.util.FormatUtil;
import com.tangem.domain.wallet.TangemCard;
import com.tangem.wallet.R;

10
app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.java
View file

@ -13,7 +13,7 @@ import com.tangem.domain.wallet.CoinEngine;
import com.tangem.domain.wallet.CoinEngineFactory;
import com.tangem.data.network.request.ElectrumRequest;
import com.tangem.data.network.task.ElectrumTask;
import com.tangem.domain.wallet.Infura_Request;
import com.tangem.data.network.request.InfuraRequest;
import com.tangem.data.network.task.InfuraTask;
import com.tangem.domain.wallet.LastSignStorage;
import com.tangem.domain.wallet.TangemCard;
@ -49,7 +49,7 @@ public class SendTransactionActivity extends AppCompatActivity {
CoinEngine engine = CoinEngineFactory.Create(mCard.getBlockchain());
if (mCard.getBlockchain() == Blockchain.Ethereum || mCard.getBlockchain() == Blockchain.EthereumTestNet || mCard.getBlockchain() == Blockchain.Token) {
ETHRequestTask task = new ETHRequestTask(mCard.getBlockchain());
Infura_Request req = Infura_Request.SendTransaction(mCard.getWallet(), tx);
InfuraRequest req = InfuraRequest.SendTransaction(mCard.getWallet(), tx);
req.setID(67);
req.setBlockchain(mCard.getBlockchain());
task.execute(req);
@ -98,12 +98,12 @@ public class SendTransactionActivity extends AppCompatActivity {
super(blockchain);
}
@Override
protected void onPostExecute(List<Infura_Request> requests) {
protected void onPostExecute(List<InfuraRequest> requests) {
super.onPostExecute(requests);
for (Infura_Request request : requests) {
for (InfuraRequest request : requests) {
try {
if (request.error == null) {
if (request.isMethod(Infura_Request.METHOD_ETH_SendRawTransaction)) {
if (request.isMethod(InfuraRequest.METHOD_ETH_SendRawTransaction)) {
try {
String hashTX = "";
try {

26
app/src/main/java/com/tangem/presentation/fragment/LoadedWalletFragment.java
View file

@ -58,7 +58,7 @@ 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.domain.wallet.Infura_Request;
import com.tangem.data.network.request.InfuraRequest;
import com.tangem.data.network.task.InfuraTask;
import com.tangem.domain.wallet.LastSignStorage;
import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog;
@ -174,11 +174,11 @@ public class LoadedWalletFragment extends Fragment implements SwipeRefreshLayout
}
else if (mCard.getBlockchain() == Blockchain.Ethereum || mCard.getBlockchain() == Blockchain.EthereumTestNet) {
ETHRequestTask updateETH = new ETHRequestTask(mCard.getBlockchain());
Infura_Request reqETH = Infura_Request.GetBalance(mCard.getWallet());
InfuraRequest reqETH = InfuraRequest.GetBalance(mCard.getWallet());
reqETH.setID(67);
reqETH.setBlockchain(mCard.getBlockchain());
Infura_Request reqNonce = Infura_Request.GetOutTransactionCount(mCard.getWallet());
InfuraRequest reqNonce = InfuraRequest.GetOutTransactionCount(mCard.getWallet());
reqNonce.setID(67);
reqNonce.setBlockchain(mCard.getBlockchain());
@ -191,15 +191,15 @@ public class LoadedWalletFragment extends Fragment implements SwipeRefreshLayout
} else if (mCard.getBlockchain() == Blockchain.Token) {
ETHRequestTask updateETH = new ETHRequestTask(mCard.getBlockchain());
Infura_Request reqETH = Infura_Request.GetTokenBalance(mCard.getWallet(), engine.GetContractAddress(mCard), engine.GetTokenDecimals(mCard));
InfuraRequest reqETH = InfuraRequest.GetTokenBalance(mCard.getWallet(), engine.GetContractAddress(mCard), engine.GetTokenDecimals(mCard));
reqETH.setID(67);
reqETH.setBlockchain(mCard.getBlockchain());
Infura_Request reqBalance = Infura_Request.GetBalance(mCard.getWallet());
InfuraRequest reqBalance = InfuraRequest.GetBalance(mCard.getWallet());
reqBalance.setID(67);
reqBalance.setBlockchain(mCard.getBlockchain());
Infura_Request reqNonce = Infura_Request.GetOutTransactionCount(mCard.getWallet());
InfuraRequest reqNonce = InfuraRequest.GetOutTransactionCount(mCard.getWallet());
reqNonce.setID(67);
reqNonce.setBlockchain(mCard.getBlockchain());
updateETH.execute(reqETH, reqNonce, reqBalance);
@ -775,7 +775,7 @@ public class LoadedWalletFragment extends Fragment implements SwipeRefreshLayout
CoinEngine engine = CoinEngineFactory.Create(mCard.getBlockchain());
if (mCard.getBlockchain() == Blockchain.Ethereum || mCard.getBlockchain() == Blockchain.EthereumTestNet || mCard.getBlockchain() == Blockchain.Token) {
ETHRequestTask task = new ETHRequestTask(mCard.getBlockchain());
Infura_Request req = Infura_Request.SendTransaction(mCard.getWallet(), tx);
InfuraRequest req = InfuraRequest.SendTransaction(mCard.getWallet(), tx);
req.setID(67);
req.setBlockchain(mCard.getBlockchain());
task.execute(req);
@ -1060,13 +1060,13 @@ public class LoadedWalletFragment extends Fragment implements SwipeRefreshLayout
}
@Override
protected void onPostExecute(List<Infura_Request> requests) {
protected void onPostExecute(List<InfuraRequest> requests) {
super.onPostExecute(requests);
for (Infura_Request request : requests) {
for (InfuraRequest request : requests) {
try {
if (request.error == null) {
if (request.isMethod(Infura_Request.METHOD_ETH_GetBalance)) {
if (request.isMethod(InfuraRequest.METHOD_ETH_GetBalance)) {
try {
String balanceCap = request.getResultString();
balanceCap = balanceCap.substring(2);
@ -1084,7 +1084,7 @@ public class LoadedWalletFragment extends Fragment implements SwipeRefreshLayout
e.printStackTrace();
ErrorOnUpdate(e.toString());
}
} else if (request.isMethod(Infura_Request.METHOD_ETH_Call)) {
} else if (request.isMethod(InfuraRequest.METHOD_ETH_Call)) {
try {
String balanceCap = request.getResultString();
balanceCap = balanceCap.substring(2);
@ -1107,7 +1107,7 @@ public class LoadedWalletFragment extends Fragment implements SwipeRefreshLayout
e.printStackTrace();
ErrorOnUpdate(e.toString());
}
} else if (request.isMethod(Infura_Request.METHOD_ETH_GetOutTransactionCount)) {
} else if (request.isMethod(InfuraRequest.METHOD_ETH_GetOutTransactionCount)) {
try {
String nonce = request.getResultString();
nonce = nonce.substring(2);
@ -1117,7 +1117,7 @@ public class LoadedWalletFragment extends Fragment implements SwipeRefreshLayout
} catch (JSONException e) {
e.printStackTrace();
}
} else if (request.isMethod(Infura_Request.METHOD_ETH_SendRawTransaction)) {
} else if (request.isMethod(InfuraRequest.METHOD_ETH_SendRawTransaction)) {
try {
String hashTX = "";

32
app/src/main/java/com/tangem/presentation/fragment/MainFragment.java
View file

@ -40,7 +40,7 @@ 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.domain.wallet.Infura_Request;
import com.tangem.data.network.request.InfuraRequest;
import com.tangem.data.network.task.InfuraTask;
import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog;
import com.tangem.domain.wallet.PINStorage;
@ -241,10 +241,10 @@ public class MainFragment extends Fragment implements NfcAdapter.ReaderCallback,
CoinEngine engine = CoinEngineFactory.Create(card.getBlockchain());
if (card.getBlockchain() == Blockchain.Ethereum || card.getBlockchain() == Blockchain.EthereumTestNet) {
ETHRequestTask task = new ETHRequestTask(card.getBlockchain());
Infura_Request req = Infura_Request.GetBalance(card.getWallet());
InfuraRequest req = InfuraRequest.GetBalance(card.getWallet());
req.setID(67);
req.setBlockchain(card.getBlockchain());
Infura_Request reqNonce = Infura_Request.GetOutTransactionCount(card.getWallet());
InfuraRequest reqNonce = InfuraRequest.GetOutTransactionCount(card.getWallet());
reqNonce.setID(67);
reqNonce.setBlockchain(card.getBlockchain());
@ -297,12 +297,12 @@ public class MainFragment extends Fragment implements NfcAdapter.ReaderCallback,
}else if (card.getBlockchain() == Blockchain.Token) {
ETHRequestTask updateETH = new ETHRequestTask(card.getBlockchain());
Infura_Request reqETH = Infura_Request.GetTokenBalance(card.getWallet(), engine.GetContractAddress(card), engine.GetTokenDecimals(card));
InfuraRequest reqETH = InfuraRequest.GetTokenBalance(card.getWallet(), engine.GetContractAddress(card), engine.GetTokenDecimals(card));
reqETH.setID(67);
reqETH.setBlockchain(card.getBlockchain());
Infura_Request reqBalance = Infura_Request.GetBalance(card.getWallet());
InfuraRequest reqBalance = InfuraRequest.GetBalance(card.getWallet());
reqBalance.setID(67);
reqBalance.setBlockchain(card.getBlockchain());
@ -311,7 +311,7 @@ public class MainFragment extends Fragment implements NfcAdapter.ReaderCallback,
ExchangeRequest rate = ExchangeRequest.GetRate(card.getWallet(), "basic-attention-token", "ethereum");
taskRate.execute(rate);
Infura_Request reqNonce = Infura_Request.GetOutTransactionCount(card.getWallet());
InfuraRequest reqNonce = InfuraRequest.GetOutTransactionCount(card.getWallet());
reqNonce.setID(67);
reqNonce.setBlockchain(card.getBlockchain());
@ -334,10 +334,10 @@ public class MainFragment extends Fragment implements NfcAdapter.ReaderCallback,
if (card.getBlockchain() == Blockchain.Ethereum || card.getBlockchain() == Blockchain.EthereumTestNet) {
ETHRequestTask task = new ETHRequestTask(card.getBlockchain());
Infura_Request req = Infura_Request.GetBalance(card.getWallet());
InfuraRequest req = InfuraRequest.GetBalance(card.getWallet());
req.setID(67);
req.setBlockchain(card.getBlockchain());
Infura_Request reqNonce = Infura_Request.GetOutTransactionCount(card.getWallet());
InfuraRequest reqNonce = InfuraRequest.GetOutTransactionCount(card.getWallet());
reqNonce.setID(67);
reqNonce.setBlockchain(card.getBlockchain());
@ -396,12 +396,12 @@ public class MainFragment extends Fragment implements NfcAdapter.ReaderCallback,
}
else if (card.getBlockchain() == Blockchain.Token) {
ETHRequestTask updateETH = new ETHRequestTask(card.getBlockchain());
Infura_Request reqETH = Infura_Request.GetTokenBalance(card.getWallet(), engine.GetContractAddress(card), engine.GetTokenDecimals(card));
InfuraRequest reqETH = InfuraRequest.GetTokenBalance(card.getWallet(), engine.GetContractAddress(card), engine.GetTokenDecimals(card));
reqETH.setID(67);
reqETH.setBlockchain(card.getBlockchain());
Infura_Request reqBalance = Infura_Request.GetBalance(card.getWallet());
InfuraRequest reqBalance = InfuraRequest.GetBalance(card.getWallet());
reqBalance.setID(67);
reqBalance.setBlockchain(card.getBlockchain());
@ -410,7 +410,7 @@ public class MainFragment extends Fragment implements NfcAdapter.ReaderCallback,
ExchangeRequest rate = ExchangeRequest.GetRate(card.getWallet(), "basic-attention-token", "ethereum");
taskRate.execute(rate);
Infura_Request reqNonce = Infura_Request.GetOutTransactionCount(card.getWallet());
InfuraRequest reqNonce = InfuraRequest.GetOutTransactionCount(card.getWallet());
reqNonce.setID(67);
reqNonce.setBlockchain(card.getBlockchain());
@ -936,13 +936,13 @@ public class MainFragment extends Fragment implements NfcAdapter.ReaderCallback,
}
@Override
protected void onPostExecute(List<Infura_Request> requests) {
protected void onPostExecute(List<InfuraRequest> requests) {
super.onPostExecute(requests);
for (Infura_Request request : requests) {
for (InfuraRequest request : requests) {
try {
if (request.error == null) {
if (request.isMethod(Infura_Request.METHOD_ETH_GetBalance)) {
if (request.isMethod(InfuraRequest.METHOD_ETH_GetBalance)) {
try {
String mWalletAddress = request.getParams().getString(0);
@ -958,7 +958,7 @@ public class MainFragment extends Fragment implements NfcAdapter.ReaderCallback,
e.printStackTrace();
FinishWithError(request.WalletAddress, e.toString());
}
} else if (request.isMethod(Infura_Request.METHOD_ETH_Call)) {
} else if (request.isMethod(InfuraRequest.METHOD_ETH_Call)) {
try {
String mWalletAddress = request.WalletAddress;
@ -983,7 +983,7 @@ public class MainFragment extends Fragment implements NfcAdapter.ReaderCallback,
e.printStackTrace();
FinishWithError(request.WalletAddress, e.toString());
}
} else if (request.isMethod(Infura_Request.METHOD_ETH_GetOutTransactionCount)) {
} else if (request.isMethod(InfuraRequest.METHOD_ETH_GetOutTransactionCount)) {
try {
String mWalletAddress = request.getParams().getString(0);