Merge pull request #99 from tradingticket/develop

Merge develop to master
tradingticket · Mar 29, 2018 · 007c5c4 · 007c5c4
2 parents 6d64c5a + 6e65f03
commit 007c5c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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.25'
+    libraryVersion = '1.0.26'
 
     developerId = 'tradingticket'
     developerName = 'Trade It'

diff --git a/...t-android-sdk/src/main/java/it/trade/android/sdk/model/TradeItLinkedBrokerParcelable.java b/...t-android-sdk/src/main/java/it/trade/android/sdk/model/TradeItLinkedBrokerParcelable.java
@@ -263,6 +263,7 @@ private List<TradeItLinkedBrokerAccountParcelable> mapBrokerAccountsToLinkedBrok
                 existingAccount.accountName = account.name;
                 existingAccount.accountBaseCurrency = account.accountBaseCurrency;
                 existingAccount.orderCapabilities = TradeItOrderCapabilityParcelable.mapOrderCapabilitiesToTradeItOrderCapabilityParcelables(account.orderCapabilities);
+                existingAccount.userCanDisableMargin = account.userCanDisableMargin;
                 linkedBrokerAccounts.add(existingAccount);
             } else {
                 linkedBrokerAccounts.add(new TradeItLinkedBrokerAccountParcelable(this, account));