modify import and reload prompt
MODIFY
bither-android/res/layout/dialog_hd_monitor_first_address_validation.xml
bither-android/res/layout/dialog_hd_monitor_first_address_validation.xml
android:textColor="@color/white"
android:textSize="18sp"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="10dp"
+ android:gravity="center"
+ android:layout_gravity="center"
+ android:text="@string/monitor_addresses_tip"
+ android:textAlignment="center"
+ android:textColor="@color/password_strength_normal"
+ android:textSize="13sp"/>
+
<TextView
android:id="@+id/tv_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textColor="@color/white"
+ android:layout_gravity="center"
android:textSize="18sp"/>
<LinearLayout

MODIFY
bither-android/res/layout/dialog_monitor_address_validation.xml
bither-android/res/layout/dialog_monitor_address_validation.xml
android:textColor="@color/white"
android:textSize="16sp"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="10dp"
+ android:gravity="center"
+ android:layout_gravity="center"
+ android:text="@string/monitor_addresses_tip"
+ android:textAlignment="center"
+ android:textColor="@color/password_strength_normal"
+ android:textSize="13sp"/>
+
<ScrollView
android:layout_width="200dp"
android:layout_gravity="center"

MODIFY
bither-android/res/values/strings.xml
bither-android/res/values/strings.xml
<string name="import_hdm_cold_seed_qr_code_scan_title">Scan HDM Cold Seed QR Code</string>
<string name="import_bip38private_key_qr_code_scan_title">Scan BIP38-private key QR Code</string>
<string name="import_private_key_qr_code_password">Enter original password</string>
- <string name="import_private_key_qr_code_success">Import success.</string>
+ <string name="import_private_key_qr_code_success">Import success. Load UTXO only</string>
<string name="import_private_key_qr_code_failed">Import failed.</string>
<string name="import_hd_account_failed_duplicated">Import failed. This account is already in Bither.</string>
<string name="import_private_key_qr_code_failed_monitored">Can\'t import Bither Cold private key.</string>
<string name="import_private_key_qr_code_failed_different_password">Password of the private key to import is different from ours. Import failed.</string>
<string name="import_private_key_failed_tx_too_mush">Cannot import private key with large amount of transactions. </string>
<string name="import_private_key_failed_special_address">Cannot import private key with special transactions. </string>
- <string name="reload_tx_need_too_much_time">Reload Transactions data?\nNeed long time.\nConsume network data.\nRecommand trying only with wrong data.</string>
+ <string name="reload_tx_need_too_much_time">Reload Transactions data?\nLoad UTXO only\nNeed long time.\nConsume network data.\nRecommand trying only with wrong data.</string>
<string name="reload_tx_please_wait">Reloading transactions data, please wait...</string>
<string name="reload_tx_failed">Reload transactions data failed , Please retry again. </string>
<string name="reload_tx_success">Reload transactions data success </string>
<string name="prompt_wallet_height">Wallet Height : %d</string>
<string name="scan_for_all_addresses_in_bither_cold">Monitor Bither Cold</string>
<string name="scan_for_all_addresses_in_bither_cold_title">Scan Qr Code to watch Bither Cold</string>
- <string name="scan_for_all_addresses_in_bither_cold_success">Monitor Bither Cold Success</string>
+ <string name="scan_for_all_addresses_in_bither_cold_success">Monitor Bither Cold Success, Load UTXO only</string>
<string name="scan_for_all_addresses_in_bither_cold_failed">Monitor Bither Cold Failed</string>
<string name="time_is_wrong">Current system time is wrong, please correct it.</string>
<string name="only_supports_the_compressed_private_key">Only supports the compressed format of private key</string>
<string name="monitor_cold_hd_account_limit">You can only monitor 1 cold HD account</string>
<string name="monitor_cold_hd_account_failed">Monitor cold HD account failed</string>
<string name="monitor_cold_hd_account_failed_duplicated">Monitor failed. This account is already in Bither.</string>
- <string name="monitor_cold_hd_account_success">Monitor cold HD account success</string>
+ <string name="monitor_cold_hd_account_success">Monitor cold HD account success, Load UTXO only</string>
<string name="address_group_hd_monitored">Cold HD Account</string>
<string name="hd_account_old_addresses">Old Addresses</string>
<string name="hd_account_old_addresses_zero">No address used yet</string>
<string name="hd_account_monitor_check_first_address">Check First Address</string>
<string name="monitor_addresses_validation">Check Monitored Addresses</string>
<string name="title_activity_ad">AdActivity</string>
+ <string name="monitor_addresses_tip">Be assured the Bither Cold Wallet of the monitor address is under your control</string>
<!-- Ad -->
<string name="ad_go">Go</string>

MODIFY
bither-android/src/net/bither/factory/ImportHDSeedAndroid.java
bither-android/src/net/bither/factory/ImportHDSeedAndroid.java
package net.bither.factory;
import android.app.Activity;
+import android.os.Handler;
import net.bither.R;
import net.bither.activity.cold.ColdAdvanceActivity;
@@ -152,11 +153,17 @@ public class ImportHDSeedAndroid extends ImportHDSeed {
}
if (activity instanceof HdmImportWordListActivity) {
- HdmImportWordListActivity hdmImportWordListActivity = (HdmImportWordListActivity) activity;
+ final HdmImportWordListActivity hdmImportWordListActivity = (HdmImportWordListActivity) activity;
hdmImportWordListActivity.showImportSuccess();
+ new Handler().postDelayed(new Runnable() {
+ @Override
+ public void run() {
hdmImportWordListActivity.setResult(Activity.RESULT_OK);
hdmImportWordListActivity.finish();
}
+ }, 3000);
+
+ }
}
});

MODIFY
bither-android/src/net/bither/runnable/GetBlockCountRunnable.java
bither-android/src/net/bither/runnable/GetBlockCountRunnable.java
@@ -24,14 +24,11 @@ public class GetBlockCountRunnable extends BaseRunnable {
public void run() {
obtainMessage(HandlerMessage.MSG_PREPARE);
try {
- GetBlockCountApi getBlockCountApi = new GetBlockCountApi();
- getBlockCountApi.handleHttpGet();
- long count = getBlockCountApi.getResult();
+ long count = GetBlockCountApi.getBlockCount();
obtainMessage(HandlerMessage.MSG_SUCCESS, count);
} catch (Exception e) {
obtainMessage(HandlerMessage.MSG_FAILURE);
e.printStackTrace();
-
}
}

MODIFY
bither-android/src/net/bither/util/MonitorBitherColdUtil.java
bither-android/src/net/bither/util/MonitorBitherColdUtil.java
@@ -179,11 +179,16 @@ public class MonitorBitherColdUtil {
if(dp != null && dp.isShowing()){
dp.dismiss();
}
+ DropdownMessage.showDropdownMessage(activity, R.string.scan_for_all_addresses_in_bither_cold_success, new Runnable() {
+ @Override
+ public void run() {
if (delegate != null) {
delegate.onAddressMonitored(addresses);
}
}
});
+ }
+ });
} catch (Exception e) {
e.printStackTrace();

modify import and reload prompt