diff --git a/DataModule/src/com/mobnetic/coinguardian/config/MarketsConfig.java b/DataModule/src/com/mobnetic/coinguardian/config/MarketsConfig.java index 718614c8..5483498c 100644 --- a/DataModule/src/com/mobnetic/coinguardian/config/MarketsConfig.java +++ b/DataModule/src/com/mobnetic/coinguardian/config/MarketsConfig.java @@ -91,8 +91,8 @@ import com.mobnetic.coinguardian.model.market.ShareXcoin; import com.mobnetic.coinguardian.model.market.SwissCex; import com.mobnetic.coinguardian.model.market.TheRock; -import com.mobnetic.coinguardian.model.market.Unisend; import com.mobnetic.coinguardian.model.market.Uphold; +import com.mobnetic.coinguardian.model.market.RipioXchg; import com.mobnetic.coinguardian.model.market.VaultOfSatoshi; import com.mobnetic.coinguardian.model.market.Vaultoro; import com.mobnetic.coinguardian.model.market.Vircurex; @@ -159,7 +159,7 @@ private final static void addMarket(Market market) { addMarket(new SwissCex()); addMarket(new Bleutrade()); addMarket(new ShareXcoin()); - addMarket(new Unisend()); + addMarket(new RipioXchg()); addMarket(new BitcoinVenezuela()); addMarket(new Korbit()); addMarket(new CoinTree()); diff --git a/DataModule/src/com/mobnetic/coinguardian/model/market/Unisend.java b/DataModule/src/com/mobnetic/coinguardian/model/market/RipioXchg.java similarity index 60% rename from DataModule/src/com/mobnetic/coinguardian/model/market/Unisend.java rename to DataModule/src/com/mobnetic/coinguardian/model/market/RipioXchg.java index dbf3ee08..75a860da 100644 --- a/DataModule/src/com/mobnetic/coinguardian/model/market/Unisend.java +++ b/DataModule/src/com/mobnetic/coinguardian/model/market/RipioXchg.java @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; +import org.json.JSONArray; import org.json.JSONObject; import com.mobnetic.coinguardian.model.CheckerInfo; @@ -11,19 +12,19 @@ import com.mobnetic.coinguardian.model.currency.Currency; import com.mobnetic.coinguardian.model.currency.VirtualCurrency; -public class Unisend extends Market { +public class RipioXchg extends Market { - private final static String NAME = "Unisend"; - private final static String TTS_NAME = "Uni send"; - private final static String URL = "https://www.unisend.com/api/price/ar/ars_btc"; + private final static String NAME = "Ripio xchg"; + private final static String TTS_NAME = "Ripio exchange"; + private final static String URL = "https://exchange.ripio.com/api/v1/book/"; private final static HashMap CURRENCY_PAIRS = new LinkedHashMap(); static { CURRENCY_PAIRS.put(VirtualCurrency.BTC, new String[]{ Currency.ARS }); } - - public Unisend() { + + public RipioXchg() { super(NAME, TTS_NAME, CURRENCY_PAIRS); } @@ -34,9 +35,12 @@ public String getUrl(int requestId, CheckerInfo checkerInfo) { @Override protected void parseTickerFromJsonObject(int requestId, JSONObject jsonObject, Ticker ticker, CheckerInfo checkerInfo) throws Exception { - final JSONObject pricesJsonObject = jsonObject.getJSONObject("prices"); - ticker.bid = pricesJsonObject.getDouble("sell"); // reversed! - ticker.ask = pricesJsonObject.getDouble("buy"); // reversed! - ticker.last = ticker.ask; + final JSONArray bidJsonArray = jsonObject.getJSONArray("bids"); + final JSONArray askJsonArray = jsonObject.getJSONArray("asks"); + + ticker.bid = bidJsonArray.getJSONObject(0).getDouble("price"); + ticker.ask = askJsonArray.getJSONObject(0).getDouble("price"); + ticker.timestamp = jsonObject.getInt("timestamp"); + } }