Merge branch 'develop'

langerhans · Jan 29, 2016 · eabd6f5 · eabd6f5
2 parents c87222f + 5e6cbab
commit eabd6f5
Show file tree

Hide file tree

Showing 15 changed files with 127 additions and 627 deletions.
diff --git a/multidoge-0.1.6-bins.md5 b/multidoge-0.1.6-bins.md5
@@ -1,3 +1,3 @@
-956C8F38EB9004F17FEE5B42DCC9FA48  multidoge-0.1.5.dmg
-E92E3364D34F35876CF14D631D90C32C  multidoge-0.1.5-linux.jar
-989ACDE5C65B29357C8F3935AD4B896C  multidoge-0.1.5-windows-setup.exe
+956C8F38EB9004F17FEE5B42DCC9FA48  multidoge-0.1.6.dmg
+E92E3364D34F35876CF14D631D90C32C  multidoge-0.1.6-linux.jar
+989ACDE5C65B29357C8F3935AD4B896C  multidoge-0.1.6-windows-setup.exe
diff --git a/multidoge-0.1.7-bins.md5 b/multidoge-0.1.7-bins.md5
@@ -0,0 +1,3 @@
+6277491E0889942F5C0213A8CA6BA1DA  multidoge-0.1.7.dmg
+E69A81B1E86C7AA72D3B36D0D5FB4218  multidoge-0.1.7-linux.jar
+6AF7401318F4E3858933CD841074C3B6  multidoge-0.1.7-windows-setup.exe
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.multibit</groupId>
     <artifactId>multidoge</artifactId>
-    <version>0.1.6</version>
+    <version>0.1.7</version>
     <name>MultiDoge</name>
     <description>A Java Swing client for Dogecoin</description>
     <url>https://multidoge.org</url>
@@ -685,52 +685,10 @@
             <artifactId>xchange-core</artifactId>
             <version>${xchange.version}</version>
         </dependency>
-        <!-- XChange MtGox exchange support -->
+        <!-- XChange Poloniex exchange support -->
         <dependency>
             <groupId>com.xeiam.xchange</groupId>
-            <artifactId>xchange-mtgox</artifactId>
-            <version>${xchange.version}</version>
-        </dependency>
-        <!-- XChange VirtEx exchange support -->
-        <dependency>
-            <groupId>com.xeiam.xchange</groupId>
-            <artifactId>xchange-cavirtex</artifactId>
-            <version>${xchange.version}</version>
-        </dependency>
-        <!-- XChange Open Exchange Rates exchange support -->
-        <dependency>
-            <groupId>com.xeiam.xchange</groupId>
-            <artifactId>xchange-openexchangerates</artifactId>
-            <version>${xchange.version}</version>
-        </dependency>
-        <!-- XChange BTC-E exchange support -->
-        <dependency>
-            <groupId>com.xeiam.xchange</groupId>
-            <artifactId>xchange-btce</artifactId>
-            <version>${xchange.version}</version>
-        </dependency>
-        <!-- XChange Bitstamp exchange support -->
-        <dependency>
-            <groupId>com.xeiam.xchange</groupId>
-            <artifactId>xchange-bitstamp</artifactId>
-            <version>${xchange.version}</version>
-        </dependency>
-        <!-- XChange CampBX exchange support -->
-        <dependency>
-            <groupId>com.xeiam.xchange</groupId>
-            <artifactId>xchange-campbx</artifactId>
-            <version>${xchange.version}</version>
-        </dependency>
-        <!-- XChange BTCChina exchange support -->
-        <dependency>
-            <groupId>com.xeiam.xchange</groupId>
-            <artifactId>xchange-btcchina</artifactId>
-            <version>${xchange.version}</version>
-        </dependency>
-        <!-- XChange Kraken exchange support -->
-        <dependency>
-            <groupId>com.xeiam.xchange</groupId>
-            <artifactId>xchange-kraken</artifactId>
+            <artifactId>xchange-poloniex</artifactId>
             <version>${xchange.version}</version>
         </dependency>
         <dependency>
@@ -819,7 +777,7 @@
         <bitcoinj.version>0.10.3-MB-ALICE</bitcoinj.version>
 
         <!-- Version of XChange to use (multiple uses) -->
-        <xchange.version>2.0.0-SNAPSHOT</xchange.version>
+        <xchange.version>3.1.0</xchange.version>
 
         <!-- Version of spongycastle to use -->
         <sc-light-jdk15on.version>1.47.0.2</sc-light-jdk15on.version>

diff --git a/release_notes.txt b/release_notes.txt
@@ -1,4 +1,7 @@
 MultiDoge release notes:
 
-14 Oct 2015: 0.1.6
-+ Fix syncing issue preventing to sync further than Oct 12
+29 Jan 2016: 0.1.7
++ Update XChange to 3.1.0
++ Replace Cryptsy with Poloniex as source for the DOGE/BTC exchange rate
++ BTC/Fiat exchange rates are provided by BitcoinAverage
++ Updated checkpoints
diff --git a/release_notes_full.txt b/release_notes_full.txt
@@ -1,4 +1,9 @@
 MultiDoge release notes:
+29 Jan 2016: 0.1.7
++ Update XChange to 3.1.0
++ Replace Cryptsy with Poloniex as source for the DOGE/BTC exchange rate
++ BTC/Fiat exchange rates are provided by BitcoinAverage
++ Updated checkpoints
 
 14 Oct 2015: 0.1.6
 + Fix syncing issue preventing to sync further than Oct 12

diff --git a/src/main/java/org/multibit/MultiBit.java b/src/main/java/org/multibit/MultiBit.java
@@ -31,6 +31,7 @@
 import org.multibit.model.bitcoin.WalletData;
 import org.multibit.model.core.CoreModel;
 import org.multibit.model.exchange.ConnectHttps;
+import org.multibit.model.exchange.ExchangeData;
 import org.multibit.model.exchange.ExchangeModel;
 import org.multibit.network.*;
 import org.multibit.platform.GenericApplication;
@@ -611,6 +612,14 @@ public void run() {
                 // Just sync the blockchain without a replay task being involved.
                 ReplayManager.INSTANCE.downloadBlockChain();
             }
+
+            // Upgrade path from cryptsy
+            if (bitcoinController.getModel().getUserPreference(ExchangeModel.TICKER_FIRST_ROW_EXCHANGE).equals(ExchangeData.CRYPTS_EXCHANGE_NAME)) {
+                bitcoinController.getModel().setUserPreference(ExchangeModel.TICKER_FIRST_ROW_EXCHANGE, ExchangeData.POLONIEX_EXCHANGE_NAME);
+            }
+            if (bitcoinController.getModel().getUserPreference(ExchangeModel.TICKER_SECOND_ROW_EXCHANGE).equals(ExchangeData.CRYPTS_EXCHANGE_NAME)) {
+                bitcoinController.getModel().setUserPreference(ExchangeModel.TICKER_SECOND_ROW_EXCHANGE, ExchangeData.POLONIEX_EXCHANGE_NAME);
+            }
         } catch (Exception e) {
             // An odd unrecoverable error occurred.
             e.printStackTrace();

diff --git a/src/main/java/org/multibit/exchange/CurrencyConverter.java b/src/main/java/org/multibit/exchange/CurrencyConverter.java
@@ -88,12 +88,6 @@ public void initialise(Controller controller) {
         String currencyCode = controller.getModel().getUserPreference(ExchangeModel.TICKER_FIRST_ROW_CURRENCY);
         String exchange = controller.getModel().getUserPreference(ExchangeModel.TICKER_FIRST_ROW_EXCHANGE);
         String newCurrencyCode = currencyCode;
-        if (ExchangeData.BITCOIN_CHARTS_EXCHANGE_NAME.equals(exchange)) {
-            // Use only the last three characters - the currency code.
-            if (currencyCode.length() >= 3) {
-                newCurrencyCode = currencyCode.substring(currencyCode.length() - 3);
-            }
-        }
         initialise(controller, newCurrencyCode);
     }