Merge branch 'dev'

# Conflicts:
#	README.md

Author: edwardstock

README.md

@@ -24,7 +24,7 @@ project build.gradle
 ```groovy
 
 ext {
-    minterBlockchainSDK = "0.1.4"
+    minterBlockchainSDK = "0.2.0"
 }
 
 dependencies {
@@ -44,7 +44,7 @@ Use our nodes
 MinterBlockChainApi.initialize();
 ```
 
-Or you can pass you own
+Or it's HIGHLY RECOMMENDED to use you own node instead of Minter's.
 ```java
 MinterBlockChainApi.initialize("https://your-node.local");
 ```

RELEASE.md

@@ -1,5 +1,10 @@
 # Release notes
 
+## 0.2.0
+ - BREAKING CHANGES:
+    - refactored blockchain api result codes, now they are is valid and representative
+ - removed android support dependencies, replaced with guava (proguard included)
+
 ## 0.1.4
  - https base minter node url
 

build.gradle

@@ -31,7 +31,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-rc03'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }
@@ -58,7 +58,7 @@ apply plugin: 'com.jfrog.bintray'
 
 
 group = 'network.minter.android'
-version = '0.1.4'
+version = '0.2.0'
 
 ext {
     minterMinSdk = 16
@@ -84,7 +84,7 @@ android {
         minSdkVersion minterMinSdk
         targetSdkVersion minterMaxSdk
 
-        versionCode 2
+        versionCode 3
         versionName version
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -154,7 +154,7 @@ dependencies {
     netMainImplementation "network.minter.android:minter-android-core:${minterCoreVers}"
 
 
-    implementation 'com.android.support:support-core-utils:27.1.1'
+//    implementation 'com.android.support:support-core-utils:28.0.0'
     // network
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
@@ -166,6 +166,7 @@ dependencies {
 
     // stuff
     implementation 'com.jakewharton.timber:timber:4.6.1'
+    implementation 'com.google.guava:guava:26.0-android'
 
     // testing
     testImplementation 'junit:junit:4.12'

src/main/java/network/minter/blockchain/models/BCResult.java

@@ -30,7 +30,6 @@
 
 /**
  * minter-android-blockchain. 2018
- *
  * @author Eduard Maximovich <edward.vstock@gmail.com>
  */
 public class BCResult<Result> {
@@ -42,32 +41,69 @@ public class BCResult<Result> {
     public String message;
 
     public enum ResultCode {
-        Unknown(-1),
-        EmptyResponse(1000),
-        @SerializedName("0") Success(0),
-        @SerializedName("1") DecodeError(1),
-        @SerializedName("107") InsufficientFundsB(107),
-        @Deprecated
-        @SerializedName("2") InsufficientFunds(2),
-        @Deprecated
-        @SerializedName("3") UnknownTransactionType(3),
-        @Deprecated
-        @SerializedName("4") WrongNonce(4),
-        @Deprecated
-        @SerializedName("5") CoinNotExists(5),
-        @Deprecated
-        @SerializedName("6") CoinAlreadyExists(6),
-        @SerializedName("301") CoinDoesNotExists(301),
-        @Deprecated
-        @SerializedName("7") WrongCrr(7),
-        @Deprecated
-        @SerializedName("8") CrossConvert(8),
-        @Deprecated
-        @SerializedName("9") CandidateExists(9),
-        @Deprecated
-        @SerializedName("10") WrongCommission(10),
-        @Deprecated
-        @SerializedName("11") CandidateNotFound(11);
+        // general
+        @SerializedName("0")
+        Success(0),
+        @SerializedName("101")
+        WrongNonce(101),
+        @SerializedName("102")
+        CoinNotExists(102),
+        @SerializedName("103")
+        CoinReserveNotSufficient(103),
+        @SerializedName("105")
+        TxTooLarge(105),
+        @SerializedName("106")
+        DecodeError(106),
+        @SerializedName("107")
+        InsufficientFunds(107),
+        @SerializedName("109")
+        TxPayloadTooLarge(109),
+        @SerializedName("110")
+        TxServiceDataTooLarge(110),
+
+        // coin creation
+        @SerializedName("201")
+        CoinAlreadyExists(201),
+        @SerializedName("202")
+        WrongCrr(202),
+        @SerializedName("203")
+        InvalidCoinSymbol(203),
+        @SerializedName("204")
+        InvalidCoinName(204),
+
+        // convert
+        @SerializedName("301")
+        CrossConvert(301),
+
+        // candidate
+        @SerializedName("401")
+        CandidateExists(401),
+        @SerializedName("402")
+        WrongCommission(402),
+        @SerializedName("403")
+        CandidateNotFound(403),
+        @SerializedName("404")
+        StakeNotFound(404),
+        @SerializedName("405")
+        InsufficientStake(405),
+        @SerializedName("406")
+        IsNotOwnerOfCandidate(406),
+        @SerializedName("407")
+        IncorrectPubKey(407),
+        @SerializedName("408")
+        StakeShouldBePositive(408),
+
+        // check
+        @SerializedName("501")
+        CheckInvalidLock(501),
+        @SerializedName("502")
+        CheckExpired(502),
+        @SerializedName("503")
+        CheckUsed(503),
+        @SerializedName("504")
+        TooHighGasPrice(504),
+        @SerializedName("505")
+        WrongGasCoin(505);
 
         final int resVal;
 

src/main/java/network/minter/blockchain/models/Balance.java

@@ -26,7 +26,7 @@
 
 package network.minter.blockchain.models;
 
-import android.support.v4.util.ObjectsCompat;
+import com.google.common.base.Objects;
 
 import org.parceler.Parcel;
 
@@ -79,16 +79,16 @@ public BigDecimal getBalance() {
 
         @Override
         public int hashCode() {
-            return ObjectsCompat.hash(coin, balance);
+            return Objects.hashCode(coin, balance);
         }
 
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
             CoinBalance balance1 = (CoinBalance) o;
-            return ObjectsCompat.equals(coin, balance1.coin) &&
-                    ObjectsCompat.equals(balance, balance1.balance);
+            return Objects.equal(coin, balance1.coin) &&
+                    Objects.equal(balance, balance1.balance);
         }
     }