diff --git a/app/build.gradle b/app/build.gradle index f18aa3510b..07f7f99a28 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { applicationId "com.tangem.wallet" minSdkVersion 21 targetSdkVersion 28 - versionCode 98 + versionCode 99 versionName "0.810.1." + generateVersionName() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } @@ -58,8 +58,13 @@ dependencies { implementation 'com.squareup.retrofit2:converter-gson:2.4.0' implementation 'com.squareup.retrofit2:retrofit:2.4.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0' - implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' implementation 'com.skyfishjy.ripplebackground:library:1.0.1' + implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + implementation 'com.google.dagger:dagger:2.16' + annotationProcessor 'com.google.dagger:dagger-compiler:2.16' + // implementation 'com.google.dagger:dagger-android:2.16' +// implementation 'com.google.dagger:dagger-android-support:2.16' // if you use the support libraries +// annotationProcessor 'com.google.dagger:dagger-android-processor:2.16' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'org.bitcoinj:bitcoinj-parent:0.14.4' implementation 'org.bitcoinj:bitcoinj-core:0.14.4' @@ -69,9 +74,4 @@ dependencies { implementation 'io.reactivex.rxjava2:rxandroid:2.0.1' implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0' - implementation 'com.google.dagger:dagger:2.16' - annotationProcessor 'com.google.dagger:dagger-compiler:2.16' -// implementation 'com.google.dagger:dagger-android:2.16' -// implementation 'com.google.dagger:dagger-android-support:2.16' // if you use the support libraries -// annotationProcessor 'com.google.dagger:dagger-android-processor:2.16' } \ No newline at end of file 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 1dab3d8d83..a97ff44a56 100644 --- a/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java +++ b/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java @@ -4,6 +4,7 @@ import android.util.Log; import com.tangem.App; import com.tangem.domain.wallet.btc.BitcoinNode; +import com.tangem.domain.wallet.btc.BitcoinNodeSsl; import com.tangem.domain.wallet.btc.BitcoinNodeTestNet; import com.tangem.domain.wallet.Blockchain; import com.tangem.domain.wallet.TangemCard; @@ -104,6 +105,8 @@ public class ServerApiElectrum { } private List testSslSocket(TangemCard card, ElectrumRequest electrumRequest) { + BitcoinNodeSsl bitcoinNodeSsl = BitcoinNodeSsl.values()[new Random().nextInt(BitcoinNodeSsl.values().length)]; + SocketFactory sf = SSLSocketFactory.getDefault(); SSLSocket socket; diff --git a/app/src/main/java/com/tangem/data/network/exception/Failure.kt b/app/src/main/java/com/tangem/data/network/exception/Failure.kt index f6b9deaa4c..f2fbb19c5b 100644 --- a/app/src/main/java/com/tangem/data/network/exception/Failure.kt +++ b/app/src/main/java/com/tangem/data/network/exception/Failure.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dmmatrix.epro.core.exception +package com.tangem.data.network.exception /** * Base Class for handling errors/failures/exceptions. diff --git a/app/src/main/java/com/tangem/presentation/viewmodel/BaseViewModel.kt b/app/src/main/java/com/tangem/presentation/viewmodel/BaseViewModel.kt index 959bc6d6d3..ea21989952 100644 --- a/app/src/main/java/com/tangem/presentation/viewmodel/BaseViewModel.kt +++ b/app/src/main/java/com/tangem/presentation/viewmodel/BaseViewModel.kt @@ -17,7 +17,7 @@ package com.tangem.presentation.viewmodel import android.arch.lifecycle.MutableLiveData import android.arch.lifecycle.ViewModel -import com.dmmatrix.epro.core.exception.Failure +import com.tangem.data.network.exception.Failure /** * Base ViewModel class with default Failure handling. diff --git a/app/src/main/java/com/tangem/presentation/viewmodel/LoadedWalletViewModel.kt b/app/src/main/java/com/tangem/presentation/viewmodel/LoadedWalletViewModel.kt index 46b4defd2c..6442aa5778 100644 --- a/app/src/main/java/com/tangem/presentation/viewmodel/LoadedWalletViewModel.kt +++ b/app/src/main/java/com/tangem/presentation/viewmodel/LoadedWalletViewModel.kt @@ -1,7 +1,7 @@ package com.tangem.presentation.viewmodel import android.arch.lifecycle.MutableLiveData -import com.dmmatrix.epro.core.exception.Failure +import com.tangem.data.network.exception.Failure class LoadedWalletViewModel : BaseViewModel() {