From b75c1d9cc9d6a81720bcebcd8e142c5030cc8d95 Mon Sep 17 00:00:00 2001 From: Tomasz Ludek Date: Mon, 10 Apr 2017 17:31:13 +0200 Subject: [PATCH 1/2] Resolving merging issues --- .../res/menu/send_coins_fragment_options.xml | 9 +++++++-- wallet/src/de/schildbach/wallet/Constants.java | 18 ++++++++++++++++++ .../wallet/ui/AddressBookActivity.java | 2 +- .../ui/preference/DiagnosticsFragment.java | 6 +++++- .../wallet/ui/send/SendCoinsActivity.java | 2 +- 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/wallet/res/menu/send_coins_fragment_options.xml b/wallet/res/menu/send_coins_fragment_options.xml index 45b1c43027..505bc46349 100644 --- a/wallet/res/menu/send_coins_fragment_options.xml +++ b/wallet/res/menu/send_coins_fragment_options.xml @@ -1,7 +1,11 @@ - + + + \ No newline at end of file diff --git a/wallet/src/de/schildbach/wallet/Constants.java b/wallet/src/de/schildbach/wallet/Constants.java index ce77f5b8c3..68ab1447d6 100644 --- a/wallet/src/de/schildbach/wallet/Constants.java +++ b/wallet/src/de/schildbach/wallet/Constants.java @@ -97,6 +97,24 @@ public final static class Files { /** Maximum size of backups. Files larger will be rejected. */ public static final long BACKUP_MAX_CHARS = 10000000; + private static final String EXPLORE_BASE_URL_PROD = CoinDefinition.BLOCKEXPLORER_BASE_URL_PROD; + private static final String EXPLORE_BASE_URL_TEST = CoinDefinition.BLOCKEXPLORER_BASE_URL_TEST; + + /** Base URL for browsing transactions, blocks or addresses. */ + public static final String EXPLORE_BASE_URL = NETWORK_PARAMETERS.getId().equals(NetworkParameters.ID_MAINNET) ? EXPLORE_BASE_URL_PROD + : EXPLORE_BASE_URL_TEST; + public static final String EXPLORE_ADDRESS_PATH = CoinDefinition.BLOCKEXPLORER_ADDRESS_PATH; + public static final String EXPLORE_TRANSACTION_PATH = CoinDefinition.BLOCKEXPLORER_TRANSACTION_PATH; + public static final String EXPLORE_BLOCK_PATH = CoinDefinition.BLOCKEXPLORER_BLOCK_PATH; + + public static final String MIMETYPE_BACKUP_PRIVATE_KEYS = "x-"+CoinDefinition.coinName.toLowerCase()+"/private-keys"; + + private static final String BITEASY_API_URL_PROD = CoinDefinition.UNSPENT_API_URL;//"https://api.biteasy.com/blockchain/v1/"; + private static final String BITEASY_API_URL_TEST = "https://api.biteasy.com/testnet/v1/"; + /** Base URL for blockchain API. */ + public static final String BITEASY_API_URL = NETWORK_PARAMETERS.getId().equals(NetworkParameters.ID_MAINNET) ? BITEASY_API_URL_PROD + : BITEASY_API_URL_TEST; + /** Currency code for the wallet name resolver. */ public static final String WALLET_NAME_CURRENCY_CODE = NETWORK_PARAMETERS.getId() .equals(NetworkParameters.ID_MAINNET) ? "dash" : "tdash"; diff --git a/wallet/src/de/schildbach/wallet/ui/AddressBookActivity.java b/wallet/src/de/schildbach/wallet/ui/AddressBookActivity.java index f4f7fec8d8..97fa059a7f 100644 --- a/wallet/src/de/schildbach/wallet/ui/AddressBookActivity.java +++ b/wallet/src/de/schildbach/wallet/ui/AddressBookActivity.java @@ -64,7 +64,7 @@ protected void onCreate(final Bundle savedInstanceState) { setContentView(R.layout.address_book_content); - final FragmentManager fragmentManager = getSupportFragmentManager(); + final FragmentManager fragmentManager = getFragmentManager(); walletAddressesFragment = (WalletAddressesFragment) fragmentManager.findFragmentByTag(TAG_LEFT); sendingAddressesFragment = (SendingAddressesFragment) fragmentManager.findFragmentByTag(TAG_RIGHT); diff --git a/wallet/src/de/schildbach/wallet/ui/preference/DiagnosticsFragment.java b/wallet/src/de/schildbach/wallet/ui/preference/DiagnosticsFragment.java index 0ed81e9e5a..43a5ebbeab 100644 --- a/wallet/src/de/schildbach/wallet/ui/preference/DiagnosticsFragment.java +++ b/wallet/src/de/schildbach/wallet/ui/preference/DiagnosticsFragment.java @@ -17,6 +17,7 @@ package de.schildbach.wallet.ui.preference; +import java.io.IOException; import java.util.Locale; import org.bitcoinj.crypto.DeterministicKey; @@ -26,6 +27,8 @@ import de.schildbach.wallet.Constants; import de.schildbach.wallet.WalletApplication; import de.schildbach.wallet.ui.DialogBuilder; +import de.schildbach.wallet.ui.ReportIssueDialogBuilder; +import de.schildbach.wallet.util.CrashReporter; import de.schildbach.wallet_test.R; import android.app.Activity; @@ -43,6 +46,7 @@ public final class DiagnosticsFragment extends PreferenceFragment { private Activity activity; private WalletApplication application; + private static final String PREFS_KEY_REPORT_ISSUE = "report_issue"; private static final String PREFS_KEY_INITIATE_RESET = "initiate_reset"; private static final String PREFS_KEY_EXTENDED_PUBLIC_KEY = "extended_public_key"; @@ -70,7 +74,7 @@ public boolean onPreferenceTreeClick(final PreferenceScreen preferenceScreen, fi if (PREFS_KEY_REPORT_ISSUE.equals(key)) { handleReportIssue(); return true; - } else if (PREFS_KEY_INITIATE_RESET.equals(key)) + } else if (PREFS_KEY_INITIATE_RESET.equals(key)) { handleInitiateReset(); return true; } else if (PREFS_KEY_EXTENDED_PUBLIC_KEY.equals(key)) { diff --git a/wallet/src/de/schildbach/wallet/ui/send/SendCoinsActivity.java b/wallet/src/de/schildbach/wallet/ui/send/SendCoinsActivity.java index 3240c52cef..491b1e4cba 100644 --- a/wallet/src/de/schildbach/wallet/ui/send/SendCoinsActivity.java +++ b/wallet/src/de/schildbach/wallet/ui/send/SendCoinsActivity.java @@ -85,7 +85,7 @@ public boolean onOptionsItemSelected(final MenuItem item) { return true; case R.id.send_coins_options_help: - HelpDialogFragment.page(getSupportFragmentManager(), R.string.help_send_coins); + HelpDialogFragment.page(getFragmentManager(), R.string.help_send_coins); return true; } From e51300ea6ee4e735353603c988c4c9393037aa36 Mon Sep 17 00:00:00 2001 From: Tomasz Ludek Date: Mon, 10 Apr 2017 18:56:38 +0200 Subject: [PATCH 2/2] Fixing the NullPointerException on devices running Android 4.x --- .../ui/WalletBalanceToolbarFragment.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wallet/src/de/schildbach/wallet/ui/WalletBalanceToolbarFragment.java b/wallet/src/de/schildbach/wallet/ui/WalletBalanceToolbarFragment.java index 02e4a70d76..69a21580a3 100644 --- a/wallet/src/de/schildbach/wallet/ui/WalletBalanceToolbarFragment.java +++ b/wallet/src/de/schildbach/wallet/ui/WalletBalanceToolbarFragment.java @@ -96,11 +96,11 @@ public void onCreate(Bundle savedInstanceState) } @Override - public void onAttach(final Context context) + public void onAttach(final Activity activity) { - super.onAttach(context); + super.onAttach(activity); - this.activity = (Activity) context; + this.activity = activity; this.application = (WalletApplication) activity.getApplication(); this.config = application.getConfiguration(); this.wallet = application.getWallet(); @@ -283,12 +283,12 @@ public void onClick(View v) } private void showAppBarMessage(CharSequence message) { - if (message != null) { - appBarMessageView.setVisibility(View.VISIBLE); - appBarMessageView.setText(message); - } else { - appBarMessageView.setVisibility(View.GONE); - } +// if (message != null) { +// appBarMessageView.setVisibility(View.VISIBLE); +// appBarMessageView.setText(message); +// } else { +// appBarMessageView.setVisibility(View.GONE); +// } } private void updateBalanceTooMuchWarning() {