diff --git a/app/build.gradle b/app/build.gradle index 7daf934858..20c244f118 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { applicationId "com.tangem.wallet" minSdkVersion 21 targetSdkVersion 27 - versionCode 80 + versionCode 81 versionName "0.89.2." + generateVersionName() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } @@ -57,7 +57,7 @@ dependencies { implementation 'com.scottyab:rootbeer-lib:0.0.6' implementation 'com.squareup.retrofit2:converter-gson:2.3.0' implementation 'com.squareup.retrofit2:retrofit:2.4.0' - implementation 'com.squareup.okhttp3:logging-interceptor:3.4.1' + implementation 'com.squareup.okhttp3:logging-interceptor:3.8.1' implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' implementation 'com.skyfishjy.ripplebackground:library:1.0.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/app/src/main/java/com/tangem/data/network/ServerApiHelper.java b/app/src/main/java/com/tangem/data/network/ServerApiHelper.java index cbe93c54c3..87ae62f17d 100644 --- a/app/src/main/java/com/tangem/data/network/ServerApiHelper.java +++ b/app/src/main/java/com/tangem/data/network/ServerApiHelper.java @@ -17,7 +17,6 @@ import com.tangem.domain.wallet.TangemCard; import com.tangem.util.Util; import java.io.BufferedReader; -import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; @@ -191,52 +190,6 @@ public class ServerApiHelper { }); } - /** - * HTTP - * Card verify - */ -// private CardVerifyListener cardVerifyListener; -// -// public interface CardVerifyListener { -// void onCardVerify(CardVerifyResponse cardVerifyResponse); -// } -// -// public void setCardVerify(CardVerifyListener listener) { -// cardVerifyListener = listener; -// } -// -// public void cardVerify(TangemCard card) { -// Retrofit retrofit = new Retrofit.Builder() -// .baseUrl(Server.ApiTangem.URL_TANGEM) -// .addConverterFactory(GsonConverterFactory.create()) -// .build(); -// -// TangemApi tangemApi = retrofit.create(TangemApi.class); -// -// CardVerify[] requests = new CardVerify[1]; -// requests[0] = new CardVerify(Util.bytesToHex(card.getCID()), Util.bytesToHex(card.getCardPublicKey())); -// -// CardVerifyBody cardVerifyBody = new CardVerifyBody(requests); -// -// Call call = tangemApi.getCardVerify(cardVerifyBody); -// call.enqueue(new Callback() { -// @Override -// public void onResponse(@NonNull Call call, @NonNull Response response) { -// if (response.code() == 200) { -// CardVerifyResponse cardVerifyResponse = response.body(); -// cardVerifyListener.onCardVerify(cardVerifyResponse); -// Log.i(TAG, "cardVerify onResponse " + response.code()); -// } else -// Log.e(TAG, "cardVerify onResponse " + response.code()); -// } -// -// @Override -// public void onFailure(@NonNull Call call, @NonNull Throwable t) { -// Log.e(TAG, "cardVerify onFailure " + t.getMessage()); -// } -// }); -// } - /** * HTTP diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt index 73a59b43b3..1a25027cdb 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -41,7 +41,6 @@ import com.tangem.wallet.R import kotlinx.android.synthetic.main.fr_loaded_wallet.* import org.json.JSONException import java.math.BigInteger -import java.time.Instant import java.util.* class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notifications, SharedPreferences.OnSharedPreferenceChangeListener { @@ -219,12 +218,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } // request card verify listener -// serverApiHelper!!.setCardVerify { -// card!!.isOnlineVerified = it.results!![0].passed -// srlLoadedWallet!!.isRefreshing = false -// -//// Log.i(TAG, "setCardVerify " + it.results!![0].passed) -// } serverApiHelper!!.setCardVerifyAndGetInfoListener { srlLoadedWallet!!.isRefreshing = false val result = it.results!![0]