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-07-17 13:22:04 +03:00
parent bc544de0c0
commit 184b74e7d2
4 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -15,7 +15,7 @@ android {
applicationId "com.tangem.wallet"
minSdkVersion 21
targetSdkVersion 27
versionCode 39
versionCode 40
versionName "0.85.5." + generateVersionName()
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

6
app/src/main/java/com/tangem/data/network/task/loaded_wallet/UpdateWalletInfoTask.java
View file

@ -56,7 +56,7 @@ public class UpdateWalletInfoTask extends ElectrumTask {
LoadedWallet loadedWallet = reference.get();
// Log.i("RequestWalletInfoTask", "onPostExecute[" + String.valueOf(loadedWallet.updateTasks.size()) + "]");
loadedWallet.updateTasks.remove(this);
// loadedWallet.updateTasks.remove(this);
CoinEngine engine = CoinEngineFactory.Create(loadedWallet.mCard.getBlockchain());
@ -155,7 +155,7 @@ public class UpdateWalletInfoTask extends ElectrumTask {
int nodePort = engine.GetNextNodePort(loadedWallet.mCard);
UpdateWalletInfoTask updateWalletInfoTask = new UpdateWalletInfoTask(loadedWallet, nodeAddress, nodePort);
loadedWallet.updateTasks.add(updateWalletInfoTask);
// loadedWallet.updateTasks.add(updateWalletInfoTask);
updateWalletInfoTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.GetHeader(mWalletAddress, String.valueOf(height)),
ElectrumRequest.GetTransaction(mWalletAddress, hash));
@ -195,7 +195,7 @@ public class UpdateWalletInfoTask extends ElectrumTask {
String nodeAddress = engine.GetNode(loadedWallet.mCard);
int nodePort = engine.GetNodePort(loadedWallet.mCard);
UpdateWalletInfoTask updateWalletInfoTask = new UpdateWalletInfoTask(loadedWallet, nodeAddress, nodePort);
loadedWallet.updateTasks.add(updateWalletInfoTask);
// loadedWallet.updateTasks.add(updateWalletInfoTask);
updateWalletInfoTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.GetHeader(mWalletAddress, String.valueOf(height)),
ElectrumRequest.GetTransaction(mWalletAddress, hash));

2
app/src/main/java/com/tangem/domain/wallet/BalanceValidator.java
View file

@ -1,7 +1,5 @@
package com.tangem.domain.wallet;
import android.util.Pair;
public class BalanceValidator {
private String firstLine;
private String secondLine;

24
app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.java
View file

@ -66,7 +66,6 @@ import com.tangem.util.Util;
import com.tangem.util.UtilHelper;
import com.tangem.wallet.R;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Timer;
@ -97,7 +96,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
private ImageView ivBlockchain, ivPIN, ivPIN2orSecurityDelay, ivDeveloperVersion;
private AppCompatButton btnExtract;
public List<AsyncTask> updateTasks = new ArrayList<>();
// public List<AsyncTask> updateTasks = new ArrayList<>();
private boolean lastReadSuccess = true;
private VerifyCardTask verifyCardTask = null;
private int requestPIN2Count = 0;
@ -124,8 +123,8 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
@Override
protected void onPostExecute(List<VerificationServerProtocol.Request> requests) {
super.onPostExecute(requests);
Log.i("OnlineVerifyTask", "onPostExecute[" + String.valueOf(updateTasks.size()) + "]");
updateTasks.remove(this);
// Log.i("OnlineVerifyTask", "onPostExecute[" + String.valueOf(updateTasks.size()) + "]");
// updateTasks.remove(this);
onlineVerifyTask=null;
for (VerificationServerProtocol.Request request : requests) {
@ -142,7 +141,8 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
errorOnUpdate(request.error);
}
}
if (updateTasks.size() == 0) mSwipeRefreshLayout.setRefreshing(false);
// if (updateTasks.size() == 0)
mSwipeRefreshLayout.setRefreshing(false);
}
}
@ -221,7 +221,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
if ( (mCard.isOnlineVerified()==null || !mCard.isOnlineVerified()) && onlineVerifyTask ==null) {
onlineVerifyTask = new OnlineVerifyTask();
updateTasks.add(onlineVerifyTask);
// updateTasks.add(onlineVerifyTask);
onlineVerifyTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, VerificationServerProtocol.Verify.prepare(mCard));
}
@ -314,9 +314,9 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
@Override
public void onStop() {
super.onStop();
for (AsyncTask ut : updateTasks) {
ut.cancel(true);
}
// for (AsyncTask ut : updateTasks) {
// ut.cancel(true);
// }
mNfcManager.onStop();
}
@ -499,7 +499,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
@Override
public void onRefresh() {
// update, showing refresh animation before making http call
if (updateTasks.size() > 0) return;
// if (updateTasks.size() > 0) return;
mSwipeRefreshLayout.setRefreshing(true);
mCard.clearInfo();
@ -524,7 +524,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
connectTaskEx.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.CheckBalance(mCard.getWallet()));
UpdateWalletInfoTask updateWalletInfoTask = new UpdateWalletInfoTask(LoadedWallet.this, nodeAddress, nodePort, data);
updateTasks.add(updateWalletInfoTask);
// updateTasks.add(updateWalletInfoTask);
updateWalletInfoTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.ListUnspent(mCard.getWallet()));
}
@ -548,7 +548,7 @@ public class LoadedWallet extends Fragment implements SwipeRefreshLayout.OnRefre
int nodePort = engine.GetNodePort(mCard);
UpdateWalletInfoTask updateWalletInfoTask = new UpdateWalletInfoTask(LoadedWallet.this,nodeAddress, nodePort, data);
updateTasks.add(updateWalletInfoTask);
// updateTasks.add(updateWalletInfoTask);
updateWalletInfoTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ElectrumRequest.ListUnspent(mCard.getWallet())
// ElectrumRequest.ListHistory(mCard.getWallet())
);