diff --git a/app/build.gradle b/app/build.gradle index a75b0ef2c6..1c56bd651c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,8 +36,8 @@ android { flavorDimensions "" productFlavors { tangemAccess { - versionCode 109 - versionName "0.905.1." + generateVersionName() + versionCode 110 + versionName "0.906.1." + generateVersionName() applicationId "com.tangem.wallet" signingConfig signingConfigs.debug } diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000000..8cf74b318f --- /dev/null +++ b/app/src/debug/AndroidManifest.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c62a9f553b..da617682cb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,12 +30,12 @@ android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning"> - + + + + + + + + + diff --git a/app/src/main/java/com/tangem/data/LogFileProvider.java b/app/src/main/java/com/tangem/data/LogFileProvider.java index 268d3f4884..b5461ae90d 100644 --- a/app/src/main/java/com/tangem/data/LogFileProvider.java +++ b/app/src/main/java/com/tangem/data/LogFileProvider.java @@ -20,11 +20,7 @@ import java.util.Objects; public class LogFileProvider extends ContentProvider { - private static final String CLASS_NAME = "LogFileProvider"; - - // The authority is the symbolic name for the provider class -// public static final String AUTHORITY = "com.tangem.LogFileProvider"; -// public static final String AUTHORITY = "com.tangem.LogFileProvider"; + private static final String TAG = LogFileProvider.class.getSimpleName() + "-oF"; // UriMatcher used to match against incoming requests private UriMatcher uriMatcher; @@ -37,20 +33,15 @@ public class LogFileProvider extends ContentProvider { // 'content://it.my.app.LogFileProvider/*' // and return 1 in the case that the incoming Uri matches this pattern -// uriMatcher.addURI(Objects.requireNonNull(getContext()).getString(R.string.log_file_provider_authorities), "*", 1); -// uriMatcher.addURI(Objects.requireNonNull("com.tangem.data.LogFileProvider"), "*", 1); + uriMatcher.addURI(Objects.requireNonNull(getContext()).getString(R.string.log_file_provider_authorities), "*", 1); return true; } @Override - public ParcelFileDescriptor openFile(Uri uri, String mode) - throws FileNotFoundException { + public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException { - String LOG_TAG = CLASS_NAME + "-oF"; - - Log.v(LOG_TAG, - "Called with uri: '" + uri + "'." + uri.getLastPathSegment()); + Log.v(TAG, "Called with uri: '" + uri + "'." + uri.getLastPathSegment()); // check incoming Uri against the matcher switch (uriMatcher.match(uri)) { @@ -74,9 +65,8 @@ public class LogFileProvider extends ContentProvider { // Otherwise unrecognised Uri default: - Log.v(LOG_TAG, "Unsupported uri: '" + uri + "'."); - throw new FileNotFoundException("Unsupported uri: " - + uri.toString()); + Log.v(TAG, "Unsupported uri: '" + uri + "'."); + throw new FileNotFoundException("Unsupported uri: " + uri.toString()); } } diff --git a/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java b/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java index 0ec02300e7..81437febfa 100644 --- a/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java +++ b/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java @@ -317,15 +317,16 @@ public class ServerApiElectrum { // install the all-trusting host verifier HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid); - SSLSocket sslSocket; + Socket sslSocket = new Socket(); List result = new ArrayList<>(); Collections.addAll(result, electrumRequest); try { Log.i(TAG, host + " " + port); - sslSocket = (SSLSocket) sf.createSocket(host, port); + sslSocket.connect(new InetSocketAddress(host,port), 3000); sslSocket.setSoTimeout(3000); + sslSocket = sf.createSocket(sslSocket, host, port, true); try { OutputStream os = sslSocket.getOutputStream(); OutputStreamWriter out = new OutputStreamWriter(os, "UTF-8"); diff --git a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt index 7f331b7aad..0772abc5ab 100644 --- a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt @@ -97,6 +97,12 @@ class MainFragment : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific viewModel.getVersionName().observe(this, Observer { text -> (activity as MainActivity).toastHelper.showSnackbarUpdateVersion(context!!, cl, text) }) + + val intent = activity?.intent + if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED == intent.action || NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action)) { + val tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG) + onTagDiscovered(tag) + } } override fun onResume() { diff --git a/app/src/main/java/com/tangem/wallet/bch/BitcoinCashNode.kt b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashNode.kt index 4331bf3600..bb76b8a698 100644 --- a/app/src/main/java/com/tangem/wallet/bch/BitcoinCashNode.kt +++ b/app/src/main/java/com/tangem/wallet/bch/BitcoinCashNode.kt @@ -2,13 +2,13 @@ package com.tangem.wallet.bch enum class BitcoinCashNode(val host: String, val port: Int, val proto: String) { N_001("electrumx.hillsideinternet.com", 50002, "ssl"), - N_002("dedi.jochen-hoenicke.de", 51002, "ssl"), - N_003("crypto.mldlabs.com", 50002, "ssl"), - N_004("electroncash.cascharia.com", 50002, "ssl"), - N_005("bch.crypto.mldlabs.com", 50002, "ssl"), +// N_002("dedi.jochen-hoenicke.de", 51002, "ssl"), +// N_003("crypto.mldlabs.com", 50002, "ssl"), +// N_004("electroncash.cascharia.com", 50002, "ssl"), +// N_005("bch.crypto.mldlabs.com", 50002, "ssl"), N_006("electron.coinucopia.io", 50002, "ssl"), N_007("blackie.c3-soft.com", 50002, "ssl"), N_008("electrum.imaginary.cash", 50002, "ssl"), - N_009("bitcoincash.quangld.com", 50002, "ssl"), - N_010("bch.stitthappens.com", 50002, "ssl"), +// N_009("bitcoincash.quangld.com", 50002, "ssl"), +// N_010("bch.stitthappens.com", 50002, "ssl"), } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/wallet/bch/CashAddr.java b/app/src/main/java/com/tangem/wallet/bch/CashAddr.java index 25c6851c16..5dbf111c97 100644 --- a/app/src/main/java/com/tangem/wallet/bch/CashAddr.java +++ b/app/src/main/java/com/tangem/wallet/bch/CashAddr.java @@ -44,7 +44,8 @@ public class CashAddr { byte[] checksumBytes = calculateChecksumBytesPolymod(allChecksumInput); checksumBytes = convertBits(checksumBytes, 8, 5, true); String cashAddress = BitcoinCashBase32.encode(concatenateByteArrays(payloadBytes, checksumBytes)); - return prefixString + SEPARATOR + cashAddress; + //return prefixString + SEPARATOR + cashAddress; + return cashAddress; } public static BitcoinCashAddressDecodedParts decodeCashAddress(String bitcoinCashAddress) { diff --git a/app/src/main/res/layout/activity_logo.xml b/app/src/main/res/layout/activity_logo.xml index cf3bb0afc9..7c7e1de15a 100644 --- a/app/src/main/res/layout/activity_logo.xml +++ b/app/src/main/res/layout/activity_logo.xml @@ -1,68 +1,68 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fr_verify_card.xml b/app/src/main/res/layout/fr_verify_card.xml index d7a6e84a44..5df73b15e4 100644 --- a/app/src/main/res/layout/fr_verify_card.xml +++ b/app/src/main/res/layout/fr_verify_card.xml @@ -93,7 +93,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/maax" - android:text="@string/smart_cash_ag" + android:text="@string/tangem_ag" android:textColor="@color/primary_dark" android:textSize="@dimen/text_size_medium" android:textStyle="normal|bold" /> @@ -317,7 +317,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/maax" - android:text="@string/smart_cash_ag" + android:text="@string/tangem_ag" android:textColor="@color/primary_dark" android:textSize="@dimen/text_size_medium" android:textStyle="normal|bold" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 35a6a77e84..9d013d2f3b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -40,7 +40,7 @@ Amount BTC Scan again to verify the card - Smart Cash AG + Tangem AG Wallet Scan again to verify the card READING… diff --git a/card-common/src/main/java/com/tangem/card_common/data/Manufacturer.java b/card-common/src/main/java/com/tangem/card_common/data/Manufacturer.java index ac1db1094c..680a3f3fb5 100644 --- a/card-common/src/main/java/com/tangem/card_common/data/Manufacturer.java +++ b/card-common/src/main/java/com/tangem/card_common/data/Manufacturer.java @@ -7,9 +7,9 @@ package com.tangem.card_common.data; public enum Manufacturer { Unknown("", "Unknown"), - SMARTCASH_AG("SMART CASH AG", "SMART CASH AG"), - DEVELOPERS_SMARTCASH_AG("DEVELOP CASH AG", "SMART CASH AG (DEVELOPERS)"), - SMARTCASH("SMART CASH", "SMART CASH"); + SMARTCASH_AG("SMART CASH AG", "TANGEM AG"), + DEVELOPERS_SMARTCASH_AG("DEVELOP CASH AG", "TANGEM AG (DEVELOPERS)"), + SMARTCASH("SMART CASH", "TANGEM"); private String ID; private String officialName;