From 49ec774b9b5b459391abe4e41f981c1fc6915e2c Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 16 Apr 2019 10:27:49 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../data/network/model/InfuraResponse.kt | 4 +-- .../main/java/com/tangem/di/NetworkModule.kt | 31 +++++++++++++------ .../java/com/tangem/wallet/eth/EthEngine.java | 2 +- .../java/com/tangem/wallet/rsk/RskEngine.java | 2 +- .../com/tangem/wallet/rsk/RskTokenEngine.java | 2 +- .../com/tangem/wallet/token/TokenEngine.java | 2 +- 6 files changed, 27 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/tangem/data/network/model/InfuraResponse.kt b/app/src/main/java/com/tangem/data/network/model/InfuraResponse.kt index 692ece2119..d565ef79c8 100644 --- a/app/src/main/java/com/tangem/data/network/model/InfuraResponse.kt +++ b/app/src/main/java/com/tangem/data/network/model/InfuraResponse.kt @@ -10,8 +10,8 @@ data class InfuraResponse( var id: Int? = null, @SerializedName("result") - var result: String = "", + var result: String? = null, @SerializedName("error") - var error: String = "" + var error: Object ) \ No newline at end of file diff --git a/app/src/main/java/com/tangem/di/NetworkModule.kt b/app/src/main/java/com/tangem/di/NetworkModule.kt index fb29acccbd..7e982995e5 100644 --- a/app/src/main/java/com/tangem/di/NetworkModule.kt +++ b/app/src/main/java/com/tangem/di/NetworkModule.kt @@ -2,6 +2,7 @@ package com.tangem.di import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory import com.tangem.data.network.Server +import com.tangem.wallet.BuildConfig import java.io.IOException import java.net.InetSocketAddress @@ -25,52 +26,62 @@ internal class NetworkModule { @Provides @Named(Server.ApiInfura.URL_INFURA) fun provideRetrofitInfura(): Retrofit { - return Retrofit.Builder() + val builder = Retrofit.Builder() .baseUrl(Server.ApiInfura.URL_INFURA) .addConverterFactory(GsonConverterFactory.create()) - .build() + if (BuildConfig.DEBUG) + builder.client(createOkHttpClient()) + return builder.build() } @Singleton @Provides @Named(Server.ApiRootstock.URL_ROOTSTOCK) fun provideRetrofitRootstock(): Retrofit { - return Retrofit.Builder() + val builder = Retrofit.Builder() .baseUrl(Server.ApiRootstock.URL_ROOTSTOCK) .addConverterFactory(GsonConverterFactory.create()) - .build() + if (BuildConfig.DEBUG) + builder.client(createOkHttpClient()) + return builder.build() } @Singleton @Provides @Named(Server.ApiEstimatefee.URL_ESTIMATEFEE) fun provideRetrofitEstimatefee(): Retrofit { - return Retrofit.Builder() + val builder = Retrofit.Builder() .baseUrl(Server.ApiEstimatefee.URL_ESTIMATEFEE) .addConverterFactory(GsonConverterFactory.create()) - .build() + if (BuildConfig.DEBUG) + builder.client(createOkHttpClient()) + return builder.build() } @Singleton @Provides @Named(Server.ApiUpdateVersion.URL_UPDATE_VERSION) fun provideGithubusercontent(): Retrofit { - return Retrofit.Builder() + val builder = Retrofit.Builder() .baseUrl(Server.ApiUpdateVersion.URL_UPDATE_VERSION) .addConverterFactory(GsonConverterFactory.create()) .client(createOkHttpClient()) - .build() + if (BuildConfig.DEBUG) + builder.client(createOkHttpClient()) + return builder.build() } @Singleton @Provides @Named(Server.ApiCoinmarket.URL_COINMARKET) fun provideRetrofitCoinmarketcap(): Retrofit { - return Retrofit.Builder() + val builder = Retrofit.Builder() .baseUrl(Server.ApiCoinmarket.URL_COINMARKET) .addConverterFactory(GsonConverterFactory.create()) .addCallAdapterFactory(RxJava2CallAdapterFactory.create()) - .build() +// if (BuildConfig.DEBUG) +// builder.client(createOkHttpClient()) + return builder.build() } private fun createOkHttpClient(): OkHttpClient { diff --git a/app/src/main/java/com/tangem/wallet/eth/EthEngine.java b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java index c7aee538c7..ce6b0d4adb 100644 --- a/app/src/main/java/com/tangem/wallet/eth/EthEngine.java +++ b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java @@ -587,7 +587,7 @@ public class EthEngine extends CoinEngine { @Override public void onSuccess(String method, InfuraResponse infuraResponse) { if (method.equals(ServerApiInfura.INFURA_ETH_SEND_RAW_TRANSACTION)) { - if (infuraResponse.getResult().isEmpty()) { + if (infuraResponse.getResult()==null || infuraResponse.getResult().isEmpty()) { ctx.setError("Rejected by node: " + infuraResponse.getError()); blockchainRequestsCallbacks.onComplete(false); } else { diff --git a/app/src/main/java/com/tangem/wallet/rsk/RskEngine.java b/app/src/main/java/com/tangem/wallet/rsk/RskEngine.java index 99e1229d9f..0ca4fe7892 100644 --- a/app/src/main/java/com/tangem/wallet/rsk/RskEngine.java +++ b/app/src/main/java/com/tangem/wallet/rsk/RskEngine.java @@ -181,7 +181,7 @@ public class RskEngine extends EthEngine { @Override public void onSuccess(String method, InfuraResponse rootstockResponse) { if (method.equals(ServerApiRootstock.ROOTSTOCK_ETH_SEND_RAW_TRANSACTION)) { - if (rootstockResponse.getResult().isEmpty()) { + if (rootstockResponse.getResult()==null || rootstockResponse.getResult().isEmpty()) { ctx.setError("Rejected by node: " + rootstockResponse.getError()); blockchainRequestsCallbacks.onComplete(false); } else { diff --git a/app/src/main/java/com/tangem/wallet/rsk/RskTokenEngine.java b/app/src/main/java/com/tangem/wallet/rsk/RskTokenEngine.java index 1d189ecc4c..1692916d68 100644 --- a/app/src/main/java/com/tangem/wallet/rsk/RskTokenEngine.java +++ b/app/src/main/java/com/tangem/wallet/rsk/RskTokenEngine.java @@ -219,7 +219,7 @@ public class RskTokenEngine extends TokenEngine { @Override public void onSuccess(String method, InfuraResponse infuraResponse) { if (method.equals(ServerApiRootstock.ROOTSTOCK_ETH_SEND_RAW_TRANSACTION)) { - if (infuraResponse.getResult().isEmpty()) { + if (infuraResponse.getResult()==null || infuraResponse.getResult().isEmpty()) { ctx.setError("Rejected by node: " + infuraResponse.getError()); blockchainRequestsCallbacks.onComplete(false); } else { diff --git a/app/src/main/java/com/tangem/wallet/token/TokenEngine.java b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java index 77e44cc5e3..7e977a84d3 100644 --- a/app/src/main/java/com/tangem/wallet/token/TokenEngine.java +++ b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java @@ -790,7 +790,7 @@ public class TokenEngine extends CoinEngine { @Override public void onSuccess(String method, InfuraResponse infuraResponse) { if (method.equals(ServerApiInfura.INFURA_ETH_SEND_RAW_TRANSACTION)) { - if (infuraResponse.getResult().isEmpty()) { + if (infuraResponse.getResult()==null || infuraResponse.getResult().isEmpty()) { ctx.setError("Rejected by node: " + infuraResponse.getError()); blockchainRequestsCallbacks.onComplete(false); } else {