From bdfb3ec37916325de811a346a696afe514e1f16f Mon Sep 17 00:00:00 2001 From: langerhans Date: Tue, 8 Dec 2015 19:38:43 +0100 Subject: [PATCH] Fix some last minute bugs --- wallet/build.gradle | 4 ++-- wallet/res/values/strings.xml | 2 +- wallet/src/de/schildbach/wallet/WalletApplication.java | 3 +++ wallet/src/de/schildbach/wallet/ui/RequestCoinsFragment.java | 4 ++-- .../src/de/schildbach/wallet/ui/SendingAddressesFragment.java | 4 ++-- wallet/src/de/schildbach/wallet/ui/WalletAddressFragment.java | 2 +- .../src/de/schildbach/wallet/ui/WalletAddressesFragment.java | 2 +- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/wallet/build.gradle b/wallet/build.gradle index 0427713bb4..de283c11c6 100644 --- a/wallet/build.gradle +++ b/wallet/build.gradle @@ -42,8 +42,8 @@ android { defaultConfig { applicationId 'de.langerhans.wallet' - versionCode 204 - versionName '2.0.4' + versionCode 206 + versionName '2.0.6' minSdkVersion 15 targetSdkVersion 22 } diff --git a/wallet/res/values/strings.xml b/wallet/res/values/strings.xml index 6ca4cc67d8..fd55a3907b 100644 --- a/wallet/res/values/strings.xml +++ b/wallet/res/values/strings.xml @@ -28,7 +28,7 @@ No Bitcoins received so far. No Bitcoins sent so far. How to get Bitcoins?\n\nTrade for traditional money,\nsell goods or services or\nearn by working. - Verwende dieses Wallet nicht für viele Transaktionen mit vielen Ausgängen, wie bspw. Mining Pool oder Faucet Auszahlungen. Sie können das Wallet bis zum Halt verlangsamen. + Do not use this wallet to receive lots of transactions with many outputs, like mining pool or faucet payouts! They tend to slow down the wallet to a halt. Congratulations, you received your first payment! Have you already <u>backed up your wallet</u>, to protect against loss? Hint: to increase the safety of your wallet, you can <u>encrypt your device</u>. This also protects data of other apps. mined diff --git a/wallet/src/de/schildbach/wallet/WalletApplication.java b/wallet/src/de/schildbach/wallet/WalletApplication.java index 9fff47a4e5..3553922cb2 100644 --- a/wallet/src/de/schildbach/wallet/WalletApplication.java +++ b/wallet/src/de/schildbach/wallet/WalletApplication.java @@ -32,6 +32,7 @@ import org.bitcoinj.core.Wallet; import org.bitcoinj.crypto.LinuxSecureRandom; import org.bitcoinj.crypto.MnemonicCode; +import org.bitcoinj.params.Networks; import org.bitcoinj.store.UnreadableWalletException; import org.bitcoinj.store.WalletProtobufSerializer; import org.bitcoinj.utils.Threading; @@ -103,6 +104,8 @@ public void onCreate() log.info("=== starting app using configuration: {}, {}", Constants.TEST ? "test" : "prod", Constants.NETWORK_PARAMETERS.getId()); + Networks.register(Constants.NETWORK_PARAMETERS); + super.onCreate(); packageInfo = packageInfoFromContext(this); diff --git a/wallet/src/de/schildbach/wallet/ui/RequestCoinsFragment.java b/wallet/src/de/schildbach/wallet/ui/RequestCoinsFragment.java index ee9c3076a7..52acfb3d8e 100644 --- a/wallet/src/de/schildbach/wallet/ui/RequestCoinsFragment.java +++ b/wallet/src/de/schildbach/wallet/ui/RequestCoinsFragment.java @@ -382,7 +382,7 @@ public boolean onOptionsItemSelected(final MenuItem item) private void handleCopy() { final Uri request = Uri.parse(determineBitcoinRequestStr(false)); - clipboardManager.setPrimaryClip(ClipData.newRawUri("Bitcoin payment request", request)); + clipboardManager.setPrimaryClip(ClipData.newRawUri("Dogecoin payment request", request)); log.info("payment request copied to clipboard: {}", request); new Toast(activity).toast(R.string.request_coins_clipboard_msg); } @@ -461,7 +461,7 @@ private String determineBitcoinRequestStr(final boolean includeBluetoothMac) uri.append(amount == null && ownName == null ? '?' : '&'); uri.append(Bluetooth.MAC_URI_PARAM).append('=').append(bluetoothMac); } - return uri.toString(); + return uri.toString().replace(BitcoinURI.BITCOIN_SCHEME, "dogecoin"); } private byte[] determinePaymentRequest(final boolean includeBluetoothMac) diff --git a/wallet/src/de/schildbach/wallet/ui/SendingAddressesFragment.java b/wallet/src/de/schildbach/wallet/ui/SendingAddressesFragment.java index 3e0504f35a..73fe0b974d 100644 --- a/wallet/src/de/schildbach/wallet/ui/SendingAddressesFragment.java +++ b/wallet/src/de/schildbach/wallet/ui/SendingAddressesFragment.java @@ -369,14 +369,14 @@ private void handleRemove(final String address) private void handleShowQr(final String address, final String label) { - final String uri = BitcoinURI.convertToBitcoinURI(address, null, label, null); + final String uri = BitcoinURI.convertToBitcoinURI(address, null, label, null).replace(BitcoinURI.BITCOIN_SCHEME, "dogecoin"); final int size = getResources().getDimensionPixelSize(R.dimen.bitmap_dialog_qr_size); BitmapFragment.show(getFragmentManager(), Qr.bitmap(uri, size)); } private void handleCopyToClipboard(final String address) { - clipboardManager.setPrimaryClip(ClipData.newPlainText("Bitcoin address", address)); + clipboardManager.setPrimaryClip(ClipData.newPlainText("Dogecoin address", address)); log.info("address copied to clipboard: {}", address.toString()); new Toast(activity).toast(R.string.wallet_address_fragment_clipboard_msg); } diff --git a/wallet/src/de/schildbach/wallet/ui/WalletAddressFragment.java b/wallet/src/de/schildbach/wallet/ui/WalletAddressFragment.java index 21e145d939..12218584b0 100644 --- a/wallet/src/de/schildbach/wallet/ui/WalletAddressFragment.java +++ b/wallet/src/de/schildbach/wallet/ui/WalletAddressFragment.java @@ -264,7 +264,7 @@ public void onLoadFinished(final Loader
loader, final Address currentAd { currentAddressQrAddress = new AddressAndLabel(currentAddress, config.getOwnName()); - final String addressStr = BitcoinURI.convertToBitcoinURI(currentAddressQrAddress.address, null, currentAddressQrAddress.label, null); + final String addressStr = BitcoinURI.convertToBitcoinURI(currentAddressQrAddress.address, null, currentAddressQrAddress.label, null).replace(BitcoinURI.BITCOIN_SCHEME, "dogecoin"); final int size = getResources().getDimensionPixelSize(R.dimen.bitmap_dialog_qr_size); currentAddressQrBitmap = Qr.bitmap(addressStr, size); diff --git a/wallet/src/de/schildbach/wallet/ui/WalletAddressesFragment.java b/wallet/src/de/schildbach/wallet/ui/WalletAddressesFragment.java index fa0ebb1e6b..fe1e9b0ef8 100644 --- a/wallet/src/de/schildbach/wallet/ui/WalletAddressesFragment.java +++ b/wallet/src/de/schildbach/wallet/ui/WalletAddressesFragment.java @@ -222,7 +222,7 @@ private void handleEdit(final Address address) private void handleShowQr(final Address address) { - final String uri = BitcoinURI.convertToBitcoinURI(address, null, config.getOwnName(), null); + final String uri = BitcoinURI.convertToBitcoinURI(address, null, config.getOwnName(), null).replace(BitcoinURI.BITCOIN_SCHEME, "dogecoin"); final int size = getResources().getDimensionPixelSize(R.dimen.bitmap_dialog_qr_size); BitmapFragment.show(getFragmentManager(), Qr.bitmap(uri, size)); }