diff --git a/app/build.gradle b/app/build.gradle index 2675dbef0c..978e69534a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,7 +40,7 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.2' } dependencies { diff --git a/app/src/main/assets/issuers.json b/app/src/main/assets/issuers.json index fd2e0b7ebb..e409506c32 100644 --- a/app/src/main/assets/issuers.json +++ b/app/src/main/assets/issuers.json @@ -38,34 +38,28 @@ { "id": "Qlear BAP", "dataKey": { - "privateEncrypted": "AB7790136D345F12EA3D6EEA0AC6C4F7DA4390C61AEDFDDC1AF35CAADF7CE5AC", - "public": "046A9CA7B99B2D8C8CB3ECCC9F1F7667ED4D324F3B3A9A83CBA0FEA8D26038D3385DE95C095EC0A92623D2C123844C8DB0FE03B90A18CC01EB3730DC3C325690A1" + "publicKey": "046A9CA7B99B2D8C8CB3ECCC9F1F7667ED4D324F3B3A9A83CBA0FEA8D26038D3385DE95C095EC0A92623D2C123844C8DB0FE03B90A18CC01EB3730DC3C325690A1" }, "transactionKey": { - "privateEncrypted": "8577EDB614252EBA21EFB47ED1D06E0E57D32E68093352B695BF90841CEF9F89", - "public": "044C8A04CA3E0D0F42799D7E356A8EDB15C97627B3EF0FA5BBDF83B4298E816ACCDED2656347CB5C42CA994DFF8389BE801591C252065E426A369F98D7E96A5AAD" + "publicKey": "044C8A04CA3E0D0F42799D7E356A8EDB15C97627B3EF0FA5BBDF83B4298E816ACCDED2656347CB5C42CA994DFF8389BE801591C252065E426A369F98D7E96A5AAD" } }, { "id": "Qlear Protocol", "dataKey": { - "privateEncrypted": "0FE60F617777B5E1C61E5E70A7622206CACC271CA07072784F5619A1CEDA0D38", - "public": "048B02F0D912B74294E296654E7A008946A0F51E8B4F1141BCB302716C4D868BADCB495681BEA670FFB125C62816CEB3B3AA4AB5EE7336F9ACEC18955493C40058" + "publicKey": "048B02F0D912B74294E296654E7A008946A0F51E8B4F1141BCB302716C4D868BADCB495681BEA670FFB125C62816CEB3B3AA4AB5EE7336F9ACEC18955493C40058" }, "transactionKey": { - "privateEncrypted": "6969D653FDD44295272C5A7AAD6E1E96B773EF0C5A109EB1A479BC4C24CD69A5", - "public": "04CBC1131BB4BB717C22CCF91C716A8BDACFB09D962A34FBFCE923B6070A40A35CC4E417B2E5ECC19EC78FA372CFF5A1D937D152981E4F0AFFDC1E60F9F0945272" + "publicKey": "04CBC1131BB4BB717C22CCF91C716A8BDACFB09D962A34FBFCE923B6070A40A35CC4E417B2E5ECC19EC78FA372CFF5A1D937D152981E4F0AFFDC1E60F9F0945272" } }, { "id": "CYCLE[bit]", "dataKey": { - "privateEncrypted": "33136604347DC20EB1769C40D7A97D6DE5F2DDF19223699DAE622A901FCDB371", - "public": "04F743D0CFA3D3B7A01F9224ECA40A2F0E09558555D0961417A7B00964ECD0FA3338784C89363A695742AF2B13D73BB30B6E0B4E59CA0A14490ED73DCECE3BCF52" + "publicKey": "04F743D0CFA3D3B7A01F9224ECA40A2F0E09558555D0961417A7B00964ECD0FA3338784C89363A695742AF2B13D73BB30B6E0B4E59CA0A14490ED73DCECE3BCF52" }, "transactionKey": { - "privateEncrypted": "D134E3FE3508641CC74F0BA8EE8B3F22B72E1277F95E5B75232E4F175B2833C2", - "public": "04ECA685AFD135EF2AB24D07BED71ED82CC1882C282976616DAC655ED3E5B8E75487C131F5D79A87895ECDE89AC58CD1BB220A0C29DD544D8D9AD5156184456F3F" + "publicKey": "04ECA685AFD135EF2AB24D07BED71ED82CC1882C282976616DAC655ED3E5B8E75487C131F5D79A87895ECDE89AC58CD1BB220A0C29DD544D8D9AD5156184456F3F" } } diff --git a/app/src/main/java/com/tangem/domain/wallet/Issuer.java b/app/src/main/java/com/tangem/domain/wallet/Issuer.java index c6affddafe..5deeec139b 100644 --- a/app/src/main/java/com/tangem/domain/wallet/Issuer.java +++ b/app/src/main/java/com/tangem/domain/wallet/Issuer.java @@ -126,7 +126,7 @@ public class Issuer { } public static Issuer FindIssuer(String ID, byte[] publicDataKey) { - for (int i = 0; i < instances.size(); i++) { + for (int i = 1; i < instances.size(); i++) { try { if (instances.get(i).id.equals(ID) && Arrays.equals(instances.get(i).getPublicDataKey(), publicDataKey)) { return instances.get(i); diff --git a/build.gradle b/build.gradle index 9839479c0c..5c101b31ab 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a52d239048..7368b742cc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon May 28 12:21:47 MSK 2018 +#Tue Sep 25 21:50:16 MSK 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip