2.8.5-2

README.md

@@ -2,13 +2,14 @@ Beta channel
 ============
 In order to receive updates quicker than others, you need to do two things:
 
-1. Join the G+ group so you are eligible for testing:
-   https://plus.google.com/communities/102264813364583686576
-
-2. Then explicitly enable beta versions of the software at:
-   https://play.google.com/apps/testing/com.mycelium.wallet
-
-As Beta Testers, please make sure you have a recent **backup of the masterseed** and all **private keys** inside Mycelium. Beta testers will experience many bugs. So far, restoring the wallet from masterseed has never been necessary, but we offer no guarantees.
+1. Join [the G+ group](https://plus.google.com/communities/102264813364583686576)
+so you are eligible for testing
+2. Then explicitly enable beta versions of the software in
+[Google play](https://play.google.com/apps/testing/com.mycelium.wallet)
+
+As Beta Testers, please make sure you have a recent **backup of the masterseed** and
+all **private keys** inside Mycelium. Beta testers will experience many bugs.
+So far, restoring the wallet from masterseed has never been necessary, but we offer no guarantees.
 
 Building
 ========

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     }
 }

public/bitlib/README.md

@@ -0,0 +1,2 @@
+This library implements the bitcoin protocol. It's to be deprecated with the switch to a modular,
+[bitcoinJ](https://bitcoinj.github.io/) based wallet.

public/coinapult/README.md

@@ -0,0 +1 @@
+[Coinapult](https://coinapult.com/) library used by [wallet](../mbw).

public/libs/README.md

@@ -0,0 +1 @@
+External libraries that needed adaptation.

public/lt-api/README.md

@@ -0,0 +1,2 @@
+    TODO: Document
+

public/mbw/README.md

@@ -0,0 +1 @@
+The "Mycelium Bitcoin Wallet".

public/mbw/build.gradle

@@ -72,7 +72,7 @@ android {
     buildToolsVersion androidSdkBuildVersion
 
     defaultConfig {
-        versionCode 28500
+        versionCode 28502
         versionName '2.8.5'
         multiDexEnabled true
     }

public/mbw/src/main/java/com/mycelium/wallet/activity/modern/ModernMain.java

@@ -240,7 +240,10 @@ protected void onSaveInstanceState(Bundle outState) {
    private void checkTorState() {
       if (_mbwManager.getTorMode() == ServerEndpointType.Types.ONLY_TOR) {
          OrbotHelper obh = new OrbotHelper(this);
-         if (!obh.isOrbotRunning(this)) {
+         // only check for Orbot if the OS is older than AndroidN (SDK_INT==24),
+         // because the current check does not work any more
+         // see: https://github.com/mycelium-com/wallet/issues/288#issuecomment-257261708
+         if (!obh.isOrbotRunning(this) && android.os.Build.VERSION.SDK_INT < 24) {
             obh.requestOrbotStart(this);
          }
       }

public/mbw/src/main/java/com/mycelium/wallet/extsig/ledger/LedgerManager.java

@@ -423,10 +423,13 @@ protected boolean onBeforeScan() {
       try {
          dongle.getFirmwareVersion();
       } catch (BTChipException e) {
-         postErrorMessage("Unable to get firmware version - if your ledger supports multiple applications please open the bitcoin app");
-         return false;
+         // this error is expected for ledger unplugged, just continue
+         if (e.getSW() != 0x6700) {
+            postErrorMessage("Unable to get firmware version - if your ledger supports multiple applications please open the bitcoin app");
+            return false;
+         }
       }
-      return initialized;
+      return true;
    }
 
    private boolean initialize() {

public/mbw/src/main/res/layout/about_activity.xml

@@ -215,6 +215,7 @@
             android:layout_height="wrap_content"
             android:text="@string/special_thanks"
             android:id="@+id/bt_special_thanks"
+            android:layout_marginTop="@dimen/buttonspacing"
             android:layout_marginBottom="@dimen/buttonspacing" />
 
         <Button

public/mbw/src/main/res/values-de/strings.xml

@@ -610,7 +610,7 @@ Schlüsseln und das Ändern des PIN-Codes verbietet
   <string name="ext_sig_total">Gesamt:</string>
   <string name="ext_sig_please_plug_in">Bitte schließen Sie ihr Gerät an</string>
   <string name="ext_sig_next_unused_account_info">Diese Option importiert das nächste ungenutzte Konto von diesem Gerät. In anderen Diensten wird es nur sichtbar, sobald Sie bitcoins dorthin senden.</string>
-  <string name="ext_sig_next_unused_account_button">Nächsten ungenutztes Konto importieren&#8230;</string>
+  <string name="ext_sig_next_unused_account_button">Nächstes ungenutztes Konto importieren&#8230;</string>
   <string name="ext_sig_new_firmware">Eine neue Firmware ist verfügbar&#8230;</string>
   <string name="trezor_new_firmware_description">Eine neue Trezor-Firmware ist verfügbar.\nBitte verwenden Sie MyTrezor.com auf einem PC, um Ihren Trezor zu aktualisieren.</string>
   <string name="ext_sig_unnamed">(unbenannt)</string>

public/mbw/src/main/res/values-zh/strings.xml

@@ -426,6 +426,8 @@
   <string name="lt_warn_account_not_spandable">选定的目标地址 (%s) 不是消费地址.\n\n 你需要有脱机私钥备份或你将会失去所接受的资金。</string>
   <string name="lt_mycelium_marketplace">Mycelium市场</string>
   <string name="lt_mycelium_marketplace_description">在您的所在地寻找买卖比特币的Mycelium用户们</string>
+  <string name="lt_missing_fx_rate">暂无当前价格信息源</string>
+  <string name="lt_price_source_not_available">暂不可用!</string>
   <!-- LT end -->
   <string name="cs_private_key_description">您正在使用基于下列比特币地址的私钥：</string>
   <string name="cs_address_description">你已经扫描一个比特的地址。你可以查看余额，但是不能用它进行消费。</string>
@@ -601,6 +603,7 @@
   <string name="trezor">Trezor</string>
   <string name="trezor_import_account">导入 Trezor HD帐户</string>
   <string name="trezor_name">Trezor:</string>
+  <string name="ext_sig_import_account_caption">导入帐户</string>
   <string name="ext_sig_select_account_to_import">选择导入帐户</string>
   <string name="ext_sig_verify_transaction_on_device">验证并确认\n您的设备上的交易</string>
   <string name="ext_sig_amount">数额</string>
@@ -611,6 +614,9 @@
   <string name="ext_sig_next_unused_account_info">此选项将从这个设备中导入下一个未使用的帐户。只有您向它发送资金, 它才会显示在其他钱包中。</string>
   <string name="ext_sig_next_unused_account_button">导入下一个未使用的帐户...</string>
   <string name="ext_sig_new_firmware">发现一个新的固件。</string>
+  <string name="ext_sig_configuration_dialog_title">设备配置</string>
+  <string name="ext_sig_device_not_initialized">此设备没有被初始化。在首次使用之前, 您需要使用一个外部应用程序来设置设备。</string>
+  <string name="external_app_needed">您需要一个外部工具来更新设备，单击确认启动它。</string>
   <string name="trezor_new_firmware_description">发现新的 Trezor 设备。 \n 请在您的电脑上使用 MyTrezor.com对您的 Trezor进行更新。</string>
   <string name="ext_sig_unnamed">\"(\"未命名\")\"</string>
   <string name="keepkey_cold_storage_header">KeepKey 冷存储</string>
@@ -915,5 +921,11 @@
   <string name="warning_sync_failed_reusing_first">同步失败 ！重用此 xpub #1 地址 ！</string>
   <string name="glidera_setting_show_button">启用 Glidera</string>
   <string name="glidera_setting_show_button_summary">显示 Glidera 的买入/卖出选项</string>
+  <string name="tap_to_toggle_through_other_currencies">通过点击切换其它货币</string>
   <!-- GlideraService End -->
+  <string name="label_single_key_icon">单一密钥</string>
+  <string name="label_blue_circle">蓝色圆圈</string>
+  <string name="label_type_it_in">请将其输入</string>
+  <string name="label_use_device_location">使用设备位置</string>
+  <string name="label_list_activity_indicator">有活动</string>
 </resources>

public/mbw/src/main/res/xml/changelog_master.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
-    <release version="2.8.5" versioncode="28500">
+    <release version="2.8.5" versioncode="28502">
         <change>Support for "Ledger Nano S"</change>
+        <change>[bugfix] dont show wrong Orbot warning on Android 6.0+</change>
+        <change>[bugfix] fix "Ledger Unplugged" communication problems</change>
+        <change>[bugfix] fix wrong Trezor firmware update message</change>
     </release>
     <release version="2.8.4" versioncode="28408">
         <change>Support for KeepKey hardware wallets</change>

public/mbwlib/README.md

@@ -0,0 +1,2 @@
+    TODO: Document
+

public/trezor/build.gradle

@@ -17,6 +17,8 @@ repositories {
 dependencies {
     compile 'com.android.support:support-v4:19.1.0'
     compile 'com.google.protobuf:protobuf-java:2.5.0'
+
+    testCompile 'junit:junit:' + junitVersion
 }
 
 android {

public/trezor/src/com/satoshilabs/trezor/ExternalSignatureDevice.java

@@ -421,9 +421,9 @@ public VersionNumber(int major, int minor, int patch) {
         public boolean isNewerThan(int major, int minor, int patch) {
             if (this.major > major) {
                 return true;
-            } else if (this.minor > minor) {
+            } else if ((this.major == major) && (this.minor > minor)) {
                 return true;
-            } else if (this.patch > patch) {
+            } else if  ((this.major == major) && (this.minor == minor) && (this.patch > patch))  {
                 return true;
             }
 

public/trezor/src/com/satoshilabs/trezor/Trezor.java

@@ -9,7 +9,7 @@ public class Trezor extends ExternalSignatureDevice {
            new SingleUsbDeviceId(0x1209, 0x53C1) // trezorV2
    );
    private static final String DEFAULT_LABEL = "Trezor";
-   private static final VersionNumber MOST_RECENT_VERSION = new VersionNumber(1, 3, 6);
+   private static final VersionNumber MOST_RECENT_VERSION = new VersionNumber(1, 4, 0);
 
    public Trezor(Context context) {
       super(context);

public/trezor/src/test/java/com/satoshilabs/trezor/VersionNumberTest.java

@@ -0,0 +1,18 @@
+package com.satoshilabs.trezor;
+
+import junit.framework.TestCase;
+
+public class VersionNumberTest extends TestCase {
+   public void testIsNewerThan() throws Exception {
+      final ExternalSignatureDevice.VersionNumber referenceVersion = new ExternalSignatureDevice.VersionNumber(1, 3, 8);
+
+      final ExternalSignatureDevice.VersionNumber newerVersion = new ExternalSignatureDevice.VersionNumber(1, 4, 0);
+      final ExternalSignatureDevice.VersionNumber currentVersion = new ExternalSignatureDevice.VersionNumber(1, 3, 8);
+      final ExternalSignatureDevice.VersionNumber oldVersion = new ExternalSignatureDevice.VersionNumber(1, 3, 6);
+
+      assertEquals(false, referenceVersion.isNewerThan(newerVersion.major, newerVersion.minor, newerVersion.patch));
+      assertEquals(false, referenceVersion.isNewerThan(currentVersion.major, currentVersion.minor, currentVersion.patch));
+      assertEquals(true, referenceVersion.isNewerThan(oldVersion.major, oldVersion.minor, oldVersion.patch));
+   }
+
+}

public/wapi/README.md

@@ -0,0 +1 @@
+Web API for the [Mycelium Bitcoin Wallet](../mbw) (server code).

public/wapi/src/main/java/com/mycelium/wapi/api/lib/WalletVersion.java

@@ -26,8 +26,8 @@ public class WalletVersion {
    private static WalletVersion noUpdatePrior = WalletVersion.from("2.0.7");
 
    private static Set<WalletVersion> latestVersions = ImmutableSet.of(
-         WalletVersion.from("2.5.3"),
-         WalletVersion.from("2.5.3-TESTNET"),
+         WalletVersion.from("2.8.5"),
+         WalletVersion.from("2.8.5-TESTNET"),
          WalletVersion.from("1.3.3-BOG"));
 
    private static Map<String, Set<WalletVersion>> latestVersionsEx = ImmutableMap.of(
@@ -85,7 +85,7 @@ public boolean isGreaterThan(WalletVersion client) {
    public static String responseVersion(String clientVersion) {
       WalletVersion client = from(clientVersion);
 
-      // only replay with an update info, if the client is already on the highe minSdk Level
+      // only replay with an update info, if the client is already on the highest minSdk Level
       if (client.isGreaterThan(noUpdatePrior)) {
          for (WalletVersion latestVersion : latestVersions) {
             if (latestVersion.isGreaterThan(client)) {
@@ -116,7 +116,7 @@ public static VersionInfoExResponse responseVersionEx(String branch, String vers
 
          for (WalletVersion latestVersion : walletVersions) {
             if (latestVersion.isGreaterThan(clientVersion)) {
-               return  new VersionInfoExResponse(latestVersion.toString(), "Update available", URI.create("https://mycelium.com/bitcoinwallet"), null);
+               return  new VersionInfoExResponse(latestVersion.toString(), "Update available", URI.create("https://wallet.mycelium.com/contact.html"), null);
             }
          }
       }

public/wapi/src/main/java/com/mycelium/wapi/api/response/Feature.java

@@ -1,5 +1,10 @@
 package com.mycelium.wapi.api.response;
 
+/**
+ * This enum is used by the backend to signal a pending alert message (via FeatureWarning) to the client.
+ * The app is supposed to show these messages, when the user wants to activate or use certain aspects of the wallet.
+ * This allows us to timely notify users of possible problems or bugs and mitigate them.
+ */
 public enum Feature {
    GENERAL,          // matches for every warning check, will override all other warnings after it
    APP_START,        // handle warning on app start