From 1deb84b98309ff49bbb0acffadf7f4995133795d Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 22 May 2019 10:29:40 +0300 Subject: [PATCH 1/7] Updated on 2026-08-14 --- app/src/main/AndroidManifest.xml | 9 +++++++++ .../com/tangem/data/network/ServerApiElectrum.java | 5 +++-- .../java/com/tangem/wallet/bch/BitcoinCashNode.kt | 12 ++++++------ .../main/java/com/tangem/wallet/bch/CashAddr.java | 3 ++- build.gradle | 2 +- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c62a9f553b..113620f871 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -59,6 +59,15 @@ + + + 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/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/build.gradle b/build.gradle index a07f7985d1..ba5d47436c 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools.build:gradle:3.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } From a69dc7727cfca41d992000a8111945c8e6b527a9 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 23 May 2019 00:00:29 +0300 Subject: [PATCH 2/7] Updated on 2026-08-14 --- app/src/main/java/com/tangem/ui/fragment/MainFragment.kt | 6 ++++++ 1 file changed, 6 insertions(+) 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() { From 90eb994feb7926cc7dfac823a2fb172a9b375746 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 4 Jun 2019 09:05:34 +0300 Subject: [PATCH 3/7] Updated on 2026-08-14 --- .idea/codeStyles/codeStyleConfig.xml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .idea/codeStyles/codeStyleConfig.xml diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000000..a55e7a179b --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file From 028133a2c62e9e349d0d765f6e4b0858d6a32441 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 5 Jun 2019 16:56:02 +0300 Subject: [PATCH 4/7] Updated on 2026-08-14 --- .idea/codeStyles/codeStyleConfig.xml | 5 + app/src/main/res/layout/activity_logo.xml | 134 +++++++++--------- app/src/main/res/layout/fr_verify_card.xml | 4 +- app/src/main/res/values/strings.xml | 2 +- .../tangem/card_common/data/Manufacturer.java | 6 +- 5 files changed, 78 insertions(+), 73 deletions(-) create mode 100644 .idea/codeStyles/codeStyleConfig.xml diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000000..a55e7a179b --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file 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; From 1f24cc73cd5605817ac64ada9889cefae665856f Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 5 Jun 2019 18:17:02 +0300 Subject: [PATCH 5/7] Updated on 2026-08-14 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 } From 7b08cb337bc139d835001f11a60e1bf46aab05a4 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 5 Jun 2019 18:18:28 +0300 Subject: [PATCH 6/7] Updated on 2026-08-14 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a07f7985d1..ba5d47436c 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools.build:gradle:3.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } From 0395afc940d6122f35f4d793190dd9916b1cce89 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 11 Jun 2019 11:08:36 +0300 Subject: [PATCH 7/7] Updated on 2026-08-14 --- app/src/debug/AndroidManifest.xml | 19 ++++++++++++++++ app/src/main/AndroidManifest.xml | 12 +++++----- .../java/com/tangem/data/LogFileProvider.java | 22 +++++-------------- 3 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 app/src/debug/AndroidManifest.xml 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 113620f871..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"> - + + + + + +