fix cold wallet clone
MODIFY
bither-android/src/net/bither/activity/cold/ColdActivity.java
bither-android/src/net/bither/activity/cold/ColdActivity.java
@@ -432,7 +432,7 @@ public class ColdActivity extends BaseFragmentActivity {
String encryptString = Utils.joinString(new String[]{passwordSeeds[1], passwordSeeds[2], passwordSeeds[3]}, QRCodeUtil.QR_CODE_SPLIT);
if (MnemonicWordList.isHDQrCode(keyString)) {
new HDAccountCold(mnemonicCode, new EncryptedData(encryptString), password);
- } else if (MnemonicWordList.isBitpieQrCode(keyString)) {
+ } else if (MnemonicWordList.isBitpieColdQrCode(keyString)) {
new BitpieHDAccountCold(mnemonicCode, new EncryptedData(encryptString), password);
}
AppSharedPreference.getInstance().setMnemonicWordList(mnemonicCode.getMnemonicWordList());

MODIFY
bither-android/src/net/bither/fragment/cold/OptionColdFragment.java
bither-android/src/net/bither/fragment/cold/OptionColdFragment.java
@@ -514,17 +514,28 @@ public class OptionColdFragment extends Fragment implements Selectable {
public void run() {
List<Address> addressList = PrivateKeyUtil.getECKeysFromBackupString(content, password);
- HDMKeychain hdmKeychain = PrivateKeyUtil.getHDMKeychain(content, password);
- HDAccountCold hdAccountCold = null;
+ HDMKeychain hdmKeychain = PrivateKeyUtil.getHDMKeychain(PrivateKeyUtil.getCloneContent(), password);
+
BitpieHDAccountCold bitpieHDAccountCold = null;
- MnemonicWordList mnemonicWordList = MnemonicWordList.getMnemonicWordListForHdSeed(content);
+ MnemonicWordList bitpieColdMnemonicWordList = MnemonicWordList.getMnemonicWordListForHdSeed(PrivateKeyUtil.getCloneContent());
MnemonicCode mnemonicCode = null;
+ if (bitpieColdMnemonicWordList != null) {
+ try {
+ mnemonicCode = new MnemonicCodeAndroid();
+ mnemonicCode.setMnemonicWordList(bitpieColdMnemonicWordList);
+ bitpieHDAccountCold = PrivateKeyUtil.getBitpieHDAccountCold(mnemonicCode, PrivateKeyUtil.getCloneContent(), password);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ HDAccountCold hdAccountCold = null;
+ MnemonicWordList mnemonicWordList = MnemonicWordList.getMnemonicWordListForHdSeed(PrivateKeyUtil.getCloneContent());
if (mnemonicWordList != null) {
try {
mnemonicCode = new MnemonicCodeAndroid();
mnemonicCode.setMnemonicWordList(mnemonicWordList);
- hdAccountCold = PrivateKeyUtil.getHDAccountCold(mnemonicCode, content, password);
- bitpieHDAccountCold = PrivateKeyUtil.getBitpieHDAccountCold(mnemonicCode, content, password);
+ hdAccountCold = PrivateKeyUtil.getHDAccountCold(mnemonicCode, PrivateKeyUtil.getCloneContent(), password);
} catch (IOException e) {
e.printStackTrace();
}

MODIFY
bitherj
bitherj
-Subproject commit f2547f62b2399a4ff9ecdc217fc132d79ac22a0e
+Subproject commit c67cba95405405e526554a3b30beb6f958138087

fix cold wallet clone