From 615b2842f5ba42d9f9649b008f667538280908d8 Mon Sep 17 00:00:00 2001 From: Eduard Maximovich Date: Mon, 28 Jan 2019 19:43:51 +0300 Subject: [PATCH] new explorer error handling, release notes --- RELEASE_NOTES.md | 11 +++++++++++ app/build.gradle | 8 ++++---- .../bipwallet/coins/repos/ExplorerBalanceFetcher.java | 11 +++++------ .../bipwallet/coins/views/CoinsTabPresenter.java | 11 ++++++----- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e7761b77..d6e931ae 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,16 @@ # Release Notes +## 1.2.7 + - Updated SDK + - Written basic UI tests + - Fixed minor UI issues + +## 1.2.6 + - (!) unreleased + +## 1.2.5 + - Fixed error while getting free coins + ## 1.2.4 - Updated blockchain SDK (min/max values to buy/sell) - New Centrifuge client diff --git a/app/build.gradle b/app/build.gradle index b0204e42..47dd4edc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,8 +53,8 @@ android { applicationId "network.minter.bipwallet" minSdkVersion minterMinSdk targetSdkVersion minterMaxSdk - versionCode 62 - versionName "1.2.7-dev03" + versionCode 63 + versionName "1.2.7" testInstrumentationRunner "network.minter.bipwallet.tests.internal.WalletTestRunner" vectorDrawables.useSupportLibrary = true multiDexEnabled true @@ -101,7 +101,7 @@ android { debug { testCoverageEnabled = true signingConfig signingConfigs.config - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro', 'proguard-test-rules.pro', 'proguard-release-rules.pro' testProguardFile 'proguard-test-rules.pro' } @@ -139,7 +139,7 @@ android { } ext { - minterExplorerSDK = "0.2.8" + minterExplorerSDK = "0.2.9" minterProfileSDK = "0.2.1" minterBlockchainSDK = "0.5.1" minterCoreSDK = "0.2.2" diff --git a/app/src/main/java/network/minter/bipwallet/coins/repos/ExplorerBalanceFetcher.java b/app/src/main/java/network/minter/bipwallet/coins/repos/ExplorerBalanceFetcher.java index adafe0be..64f104ef 100644 --- a/app/src/main/java/network/minter/bipwallet/coins/repos/ExplorerBalanceFetcher.java +++ b/app/src/main/java/network/minter/bipwallet/coins/repos/ExplorerBalanceFetcher.java @@ -1,5 +1,5 @@ /* - * Copyright (C) by MinterTeam. 2018 + * Copyright (C) by MinterTeam. 2019 * @link Org Github * @link Maintainer Github * @@ -48,12 +48,11 @@ import network.minter.explorer.repo.ExplorerAddressRepository; import timber.log.Timber; -import static network.minter.bipwallet.internal.ReactiveAdapter.convertToExpErrorResult; +import static network.minter.bipwallet.internal.ReactiveAdapter.convertToBcExpErrorResult; import static network.minter.bipwallet.internal.ReactiveAdapter.rxCallExp; /** * minter-android-wallet. 2018 - * * @author Eduard Maximovich */ public class ExplorerBalanceFetcher implements ObservableOnSubscribe> { @@ -78,7 +77,7 @@ public static Observable createSingleTotalBalance(ExplorerAddressRep return rxCallExp(addressRepository.getAddressData(address)) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) - .onErrorResumeNext(convertToExpErrorResult()) + .onErrorResumeNext(convertToBcExpErrorResult()) .map(item -> item.result.getTotalBalance()); } @@ -86,7 +85,7 @@ public static Observable createSingleCoinBalance(ExplorerAddressRepo return rxCallExp(addressRepository.getAddressData(address)) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) - .onErrorResumeNext(convertToExpErrorResult()) + .onErrorResumeNext(convertToBcExpErrorResult()) .map(item -> { BigDecimal out = new BigDecimal(0); for (Map.Entry entry : item.result.coins.entrySet()) { @@ -112,7 +111,7 @@ public void subscribe(ObservableEmitter> emitter) throws Excep for (MinterAddress address : mAddresses) { rxCallExp(mAddressRepository.getAddressData(address)) - .onErrorResumeNext(convertToExpErrorResult()) + .onErrorResumeNext(convertToBcExpErrorResult()) .subscribeOn(Schedulers.io()) .subscribe(res -> { synchronized (mLock) { diff --git a/app/src/main/java/network/minter/bipwallet/coins/views/CoinsTabPresenter.java b/app/src/main/java/network/minter/bipwallet/coins/views/CoinsTabPresenter.java index d97446b3..2ce71aaa 100644 --- a/app/src/main/java/network/minter/bipwallet/coins/views/CoinsTabPresenter.java +++ b/app/src/main/java/network/minter/bipwallet/coins/views/CoinsTabPresenter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) by MinterTeam. 2018 + * Copyright (C) by MinterTeam. 2019 * @link Org Github * @link Maintainer Github * @@ -223,14 +223,15 @@ protected void onFirstViewAttach() { .filter(item -> item.getCoin().equals(MinterSDK.DEFAULT_COIN)) .findFirst(); + final StringHelper.DecimalStringFraction num; if (!defAccount.isPresent()) { - final StringHelper.DecimalStringFraction num = StringHelper.splitDecimalStringFractions(new BigDecimal("0").setScale(4, RoundingMode.DOWN)); - mBalanceCurrentState.set(num.intPart, num.fractionalPart, bips(Long.parseLong(num.intPart))); + num = StringHelper.splitDecimalStringFractions(new BigDecimal("0").setScale(4, RoundingMode.DOWN)); } else { - final StringHelper.DecimalStringFraction num = StringHelper.splitDecimalStringFractions(defAccount.get().getBalance().setScale(4, RoundingMode.DOWN)); - mBalanceCurrentState.set(num.intPart, num.fractionalPart, bips(Long.parseLong(num.intPart))); + num = StringHelper.splitDecimalStringFractions(defAccount.get().getBalance().setScale(4, RoundingMode.DOWN)); } + mBalanceCurrentState.set(num.intPart, num.fractionalPart, bips(Long.parseLong(num.intPart))); + mBalanceCurrentState.applyTo(getViewState()); mCoinsRow.setStatus(ListWithButtonRow.Status.Normal);