Skip to content

Commit

Permalink
Remove blockchain.info from feeds for exchange rates.
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Schildbach committed Aug 23, 2016
1 parent 2d27b05 commit b9cef5f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
4 changes: 0 additions & 4 deletions wallet/README
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,6 @@ I chose this feed because it is not dependent on a single exchange. However, you
mind it's always a 24h average (falling back to 7d or even 30d if no trade occurred for a long
time).

If the above feed is not available, the feed from "Blockchain.info" is fetched instead:

https://blockchain.info/ticker


SWEEPING WALLETS

Expand Down
8 changes: 0 additions & 8 deletions wallet/src/de/schildbach/wallet/ExchangeRatesProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,12 @@ public String toString()
private static final URL BITCOINAVERAGE_URL;
private static final String[] BITCOINAVERAGE_FIELDS = new String[] { "24h_avg", "last" };
private static final String BITCOINAVERAGE_SOURCE = "BitcoinAverage.com";
private static final URL BLOCKCHAININFO_URL;
private static final String[] BLOCKCHAININFO_FIELDS = new String[] { "15m" };
private static final String BLOCKCHAININFO_SOURCE = "blockchain.info";

// https://bitmarket.eu/api/ticker

static
{
try
{
BITCOINAVERAGE_URL = new URL("https://api.bitcoinaverage.com/custom/abw");
BLOCKCHAININFO_URL = new URL("https://blockchain.info/ticker");
}
catch (final MalformedURLException x)
{
Expand Down Expand Up @@ -169,8 +163,6 @@ public Cursor query(final Uri uri, final String[] projection, final String selec
Map<String, ExchangeRate> newExchangeRates = null;
if (newExchangeRates == null)
newExchangeRates = requestExchangeRates(BITCOINAVERAGE_URL, userAgent, BITCOINAVERAGE_SOURCE, BITCOINAVERAGE_FIELDS);
if (newExchangeRates == null)
newExchangeRates = requestExchangeRates(BLOCKCHAININFO_URL, userAgent, BLOCKCHAININFO_SOURCE, BLOCKCHAININFO_FIELDS);

if (newExchangeRates != null)
{
Expand Down

0 comments on commit b9cef5f

Please sign in to comment.