Merge pull request #3 from PreICO/master

Fee fixes
fincubator · Oct 28, 2018 · 8db1349 · 8db1349
2 parents f9ce088 + 7538efa
commit 8db1349
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/BitsharesApplication.java b/app/src/main/java/com/bitshares/bitshareswallet/BitsharesApplication.java
@@ -87,6 +87,6 @@ public void onCreate() {
                 this,
                 BitsharesDatabase.class,
                 "bitshares.db"
-        ).build();
+        ).allowMainThreadQueries().build();
     }
 }
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyFragment.java b/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyFragment.java
@@ -16,6 +16,7 @@
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,6 +28,7 @@
 
 import com.bitshares.bitshareswallet.market.MarketStat;
 import com.bitshares.bitshareswallet.room.BitsharesAsset;
+import com.bitshares.bitshareswallet.room.BitsharesAssetObject;
 import com.bitshares.bitshareswallet.room.BitsharesBalanceAsset;
 import com.bitshares.bitshareswallet.viewmodel.SellBuyViewModel;
 import com.bitshares.bitshareswallet.wallet.BitsharesWalletWraper;
@@ -278,6 +280,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
             String qString = qEditText.getText().toString();
             String pString = pEditText.getText().toString();
             if (TextUtils.isEmpty(qString) || TextUtils.isEmpty(pString)) {
+                tokenSelectDialog.close();
                 return;
             }
 
@@ -608,8 +611,12 @@ private double calculateSellFee(asset_object symbolToSell, asset_object symbolTo
                 return utils.get_asset_amount(a.amount, btsAssetObj);
             } else if (a.asset_id.equals(baseAssetObj.id)) {
                 return utils.get_asset_amount(a.amount, baseAssetObj);
-            } else {
+            } else if(a.asset_id.equals(quoteAssetObj.id)) {
                 return utils.get_asset_amount(a.amount, quoteAssetObj);
+            } else {
+                BitsharesAssetObject assetObject = BitsharesApplication.getInstance()
+                        .getBitsharesDatabase().getBitsharesDao().queryAssetObjectById(a.asset_id.toString());
+                return utils.get_asset_amount(a.amount, assetObject);
             }
         } catch (NetworkStatusException e) {
             return 0;
@@ -629,8 +636,12 @@ private double calculateBuyFee(asset_object symbolToReceive, asset_object symbol
                 return utils.get_asset_amount(a.amount, btsAssetObj);
             } else if (a.asset_id.equals(baseAssetObj.id)) {
                 return utils.get_asset_amount(a.amount, baseAssetObj);
-            } else {
+            } else if(a.asset_id.equals(quoteAssetObj.id)) {
                 return utils.get_asset_amount(a.amount, quoteAssetObj);
+            } else {
+                BitsharesAssetObject assetObject = BitsharesApplication.getInstance()
+                        .getBitsharesDatabase().getBitsharesDao().queryAssetObjectById(a.asset_id.toString());
+                return utils.get_asset_amount(a.amount, assetObject);
             }
         } catch (NetworkStatusException e) {
             return 0;