modify reload tx
MODIFY
bither-android/res/layout/dialog_progress.xml
bither-android/res/layout/dialog_progress.xml
<TextView
android:id="@+id/tv"
android:layout_width="wrap_content"
- android:layout_height="34dp"
+ android:layout_height="wrap_content"
+ android:minHeight="34dp"
android:layout_gravity="center"
android:layout_marginLeft="10dp"
android:gravity="center_vertical"

MODIFY
bither-android/res/values/strings.xml
bither-android/res/values/strings.xml
<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_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="tx_cannot_reloding">You can only reload transactions data in a hour..</string>

MODIFY
bither-android/src/net/bither/BitherApplication.java
bither-android/src/net/bither/BitherApplication.java
@@ -109,12 +109,8 @@ public class BitherApplication extends Application {
}
public static void startBlockchainService() {
- if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) {
- mContext.startForegroundService(new Intent(mContext, BlockchainService.class));
- } else {
mContext.startService(new Intent(mContext, BlockchainService.class));
}
- }
public static boolean canReloadTx() {

MODIFY
bither-android/src/net/bither/ChooseModeActivity.java
bither-android/src/net/bither/ChooseModeActivity.java
@@ -710,12 +710,8 @@ public class ChooseModeActivity extends BaseActivity {
Intent intent = new Intent(
BlockchainService.ACTION_BEGIN_DOWLOAD_SPV_BLOCK, null,
BitherApplication.mContext, BlockchainService.class);
- if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) {
- BitherApplication.mContext.startForegroundService(intent);
- } else {
BitherApplication.mContext.startService(intent);
}
- }
@Override
protected boolean shouldPresentPinCode() {

MODIFY
bither-android/src/net/bither/activity/hot/HotAdvanceActivity.java
bither-android/src/net/bither/activity/hot/HotAdvanceActivity.java
@@ -438,10 +438,6 @@ public class HotAdvanceActivity extends SwipeRightFragmentActivity {
public void onClick(View v) {
if (BitherApplication.canReloadTx()) {
- if (!AddressManager.getInstance().addressIsSyncComplete()) {
- DropdownMessage.showDropdownMessage(HotAdvanceActivity.this, R.string.no_sync_complete);
- return;
- }
final Runnable confirmRunnable = new Runnable() {
@Override
public void run() {
@@ -591,7 +587,9 @@ public class HotAdvanceActivity extends SwipeRightFragmentActivity {
@Override
public void run() {
if (dp == null) {
- dp = new DialogProgress(HotAdvanceActivity.this, R.string.please_wait);
+ dp = new DialogProgress(HotAdvanceActivity.this, R.string.reload_tx_please_wait);
+ } else {
+ dp.setMessage(R.string.reload_tx_please_wait);
}
dp.show();
}

MODIFY
bitherj
bitherj
-Subproject commit 73da616867f868d126d41ea5f491bd60019a9466
+Subproject commit a45bac3785067f729dace7c2563861572b03bd6c

MODIFY
build.gradle
build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.android.library'
buildscript {
repositories {
mavenCentral()
+ google()
// maven {
// url 'https://maven.google.com/'
// name 'Google'
@@ -91,5 +92,6 @@ allprojects {
maven {
url 'https://maven.google.com'
}
+ google()
}
}
\ No newline at end of file

modify reload tx