Updated on 2026-08-14

This commit is contained in:
Tangem 2020-03-17 12:42:18 +00:00
commit f7dee48499
9 changed files with 13 additions and 43 deletions

28
.idea/gradle.xml generated
View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="delegatedBuild" value="false" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/blockchain" />
<option value="$PROJECT_DIR$/server-android" />
<option value="$PROJECT_DIR$/tangem-card-old" />
<option value="$PROJECT_DIR$/tangem-core" />
<option value="$PROJECT_DIR$/tangem-demo" />
<option value="$PROJECT_DIR$/tangem-sdk" />
<option value="$PROJECT_DIR$/tangem-sdk-old" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="testRunner" value="PLATFORM" />
</GradleProjectSettings>
</option>
</component>
</project>

View file

@ -297,16 +297,15 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
serverApiTangem.setArtworkListener(artworkListener)
refresh()
startVerify(lastTag)
}
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
viewModel = ViewModelProviders.of(this).get(LoadedWalletViewModel::class.java)
// set rate info to CoinData
viewModel.getRateInfo().observe(this, Observer<Float> { rate ->
ctx.coinData.rate = rate
ctx.coinData.rateAlter = rate
updateViews()
})
viewModel.requestRateInfo(ctx)
}

View file

@ -219,9 +219,9 @@ public class BtcEngine extends CoinEngine {
@Override
public Uri getShareWalletUri() {
if (ctx.getCard().getDenomination() != null && !ctx.getCard().getDenominationText().equals("0.00")) {
return Uri.parse("bitcoin:" + ctx.getCoinData().getWallet() + "?amount=" + convertToAmount(convertToInternalAmount(ctx.getCard().getDenomination())).toValueString(8));
return Uri.parse(ctx.getCoinData().getWallet() + "?amount=" + convertToAmount(convertToInternalAmount(ctx.getCard().getDenomination())).toValueString(8));
} else {
return Uri.parse("bitcoin:" + ctx.getCoinData().getWallet());
return Uri.parse(ctx.getCoinData().getWallet());
}
}

View file

@ -231,7 +231,7 @@ public class EthEngine extends CoinEngine {
// if (ctx.getCard().getDenomination() != null) {
// return Uri.parse("ethereum:" + ctx.getCoinData().getWallet());// + "?value=" + mCard.getDenomination() +"e18");
if (ctx.getBlockchain() == Blockchain.Ethereum) {
return Uri.parse("ethereum:" + ctx.getCoinData().getWallet());
return Uri.parse(ctx.getCoinData().getWallet());
} else {
return Uri.parse(ctx.getCoinData().getWallet());
}

View file

@ -27,7 +27,6 @@ import com.tangem.wallet.EthTransaction;
import com.tangem.wallet.Keccak256;
import com.tangem.wallet.R;
import com.tangem.wallet.TangemContext;
import com.tangem.wallet.eth.EthData;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.SignatureDecodeException;
@ -185,9 +184,9 @@ public class EthIdEngine extends CoinEngine {
@Override
public Uri getShareWalletUri() {
if (ctx.getCard().getDenomination() != null) {
return Uri.parse("ethereum:" + ctx.getCoinData().getWallet());// + "?value=" + mCard.getDenomination() +"e18");
return Uri.parse(ctx.getCoinData().getWallet());// + "?value=" + mCard.getDenomination() +"e18");
} else {
return Uri.parse("ethereum:" + ctx.getCoinData().getWallet());
return Uri.parse(ctx.getCoinData().getWallet());
}
}

View file

@ -179,9 +179,9 @@ public class LtcEngine extends BtcEngine {
@Override
public Uri getShareWalletUri() {
if (ctx.getCard().getDenomination() != null) {
return Uri.parse("litecoin:" + ctx.getCoinData().getWallet() + "?amount=" + convertToAmount(convertToInternalAmount(ctx.getCard().getDenomination())).toValueString(8));
return Uri.parse(ctx.getCoinData().getWallet() + "?amount=" + convertToAmount(convertToInternalAmount(ctx.getCard().getDenomination())).toValueString(8));
} else {
return Uri.parse("litecoin:" + ctx.getCoinData().getWallet());
return Uri.parse(ctx.getCoinData().getWallet());
}
}

View file

@ -189,7 +189,7 @@ public class NftTokenEngine extends CoinEngine {
@Override
public Uri getShareWalletUri() {
return Uri.parse("ethereum:" + ctx.getCoinData().getWallet());
return Uri.parse(ctx.getCoinData().getWallet());
}
@Override

View file

@ -305,9 +305,9 @@ public class TokenEngine extends CoinEngine {
@Override
public Uri getShareWalletUri() {
if (ctx.getCard().getDenomination() != null) {
return Uri.parse("ethereum:" + ctx.getCoinData().getWallet());// + "?value=" + mCard.getDenomination() +"e18");
return Uri.parse(ctx.getCoinData().getWallet());// + "?value=" + mCard.getDenomination() +"e18");
} else {
return Uri.parse("ethereum:" + ctx.getCoinData().getWallet());
return Uri.parse(ctx.getCoinData().getWallet());
}
}

View file

@ -148,7 +148,7 @@ public class XrpEngine extends CoinEngine {
}
public Uri getShareWalletUri() {
return Uri.parse("ripple:" + ctx.getCoinData().getWallet());
return Uri.parse(ctx.getCoinData().getWallet());
}
@Override