Merge pull request #98 from tradingticket/develop

Merge develop to master
tradingticket · Mar 28, 2018 · 6d64c5a · 6d64c5a
2 parents 82cec70 + b876f23
commit 6d64c5a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/tradeit-android-sdk/build.gradle b/tradeit-android-sdk/build.gradle
@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/tradingticket/AndroidSDK'
     gitUrl = 'https://github.com/tradingticket/AndroidSDK.git'
 
-    libraryVersion = '1.0.24'
+    libraryVersion = '1.0.25'
 
     developerId = 'tradingticket'
     developerName = 'Trade It'

diff --git a/...id-sdk/src/main/java/it/trade/android/sdk/model/TradeItLinkedBrokerAccountParcelable.java b/...id-sdk/src/main/java/it/trade/android/sdk/model/TradeItLinkedBrokerAccountParcelable.java
@@ -256,8 +256,6 @@ public boolean equals(Object o) {
             return false;
         if (accountNumber != null ? !accountNumber.equals(that.accountNumber) : that.accountNumber != null)
             return false;
-        if (userCanDisableMargin != that.userCanDisableMargin)
-            return false;
         return accountBaseCurrency != null ? accountBaseCurrency.equals(that.accountBaseCurrency) : that.accountBaseCurrency == null;
 
     }