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-09-06 15:04:50 +03:00
parent 692682e750
commit 1fe704da31
3 changed files with 29 additions and 12 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 71
versionCode 72
versionName "0.88.1." + generateVersionName()
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

3
app/src/main/java/com/tangem/data/network/task/ElectrumTask.java
View file

@ -60,7 +60,8 @@ public class ElectrumTask extends AsyncTask<ElectrumRequest, Integer, List<Elect
Log.v(logTag, "Connecting..." + Host);
// Socket socket = new Socket(serverAddress, port);
Socket socket = new Socket();
socket.setSoTimeout(5000);
// socket.setSoTimeout(5000);
socket.setSoTimeout(10000);
socket.bind(new InetSocketAddress(0));
socket.connect(new InetSocketAddress(serverAddress, Port));
// Log.i("effefefe", host);

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

@ -73,6 +73,8 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
private val inactiveColor: ColorStateList by lazy { resources.getColorStateList(R.color.primary) }
private val activeColor: ColorStateList by lazy { resources.getColorStateList(R.color.colorAccent) }
private val timerRepeatRefresh = Timer()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
nfcManager = NfcManager(activity, this)
@ -112,21 +114,21 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
btnExtract.backgroundTintList = inactiveColor
updateViews()
// updateViews()
if (!card!!.hasBalanceInfo()) {
srlLoadedWallet!!.isRefreshing = true
srlLoadedWallet!!.postDelayed({ this.refresh() }, 1000)
}
// if (!card!!.hasBalanceInfo()) {
// srlLoadedWallet!!.isRefreshing = true
// srlLoadedWallet!!.postDelayed({ refresh() }, 1000)
// }
// requestCardVerify()
repeatRefresh()
startVerify(lastTag)
tvWallet.text = card!!.wallet
// set listeners
srlLoadedWallet!!.setOnRefreshListener { this.refresh() }
srlLoadedWallet!!.setOnRefreshListener { refresh() }
btnLookup.setOnClickListener {
val engineClick = CoinEngineFactory.create(card!!.blockchain)
val browserIntent = Intent(Intent.ACTION_VIEW, engineClick.getShareWalletUriExplorer(card))
@ -249,9 +251,22 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
nfcManager!!.onResume()
}
private fun repeatRefresh() {
val getBalance = object : TimerTask() {
override fun run() {
activity!!.runOnUiThread {
refresh()
// Log.i("efgrgegsdfgsd", "repeatRefresh")
}
}
}
timerRepeatRefresh.schedule(getBalance, 0, 5000)
}
override fun onPause() {
super.onPause()
nfcManager!!.onPause()
timerRepeatRefresh.cancel()
}
override fun onStop() {
@ -397,10 +412,11 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
}
REQUEST_CODE_SEND_PAYMENT, REQUEST_CODE_RECEIVE_PAYMENT -> {
if (resultCode == Activity.RESULT_OK) {
srlLoadedWallet!!.postDelayed({ this.refresh() }, 10000)
srlLoadedWallet!!.isRefreshing = true
// srlLoadedWallet!!.postDelayed({ refresh() }, 10000)
// srlLoadedWallet!!.isRefreshing = true
card!!.clearInfo()
updateViews()
repeatRefresh()
// updateViews()
}
if (data != null && data.extras != null) {