From 3846a0c39131545563fcc9d755629b95c6588759 Mon Sep 17 00:00:00 2001 From: m2049r <30435443+m2049r@users.noreply.github.com> Date: Tue, 29 Aug 2017 22:22:07 +0200 Subject: [PATCH] mainnet spending --- app/src/main/java/com/m2049r/xmrwallet/SendFragment.java | 4 ---- app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java | 2 +- .../main/java/com/m2049r/xmrwallet/service/WalletService.java | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java b/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java index c3a3eb3..5a9ae09 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java @@ -99,10 +99,6 @@ public class SendFragment extends Fragment { etPaymentId.setRawInputType(InputType.TYPE_CLASS_TEXT); etNotes.setRawInputType(InputType.TYPE_CLASS_TEXT); -// etAddress.setText("9tDC52GsMjTNt4dpnRCwAF7ekVBkbkgkXGaMKTcSTpBhGpqkPX56jCNRydLq9oGjbbAQBsZhLfgmTKsntmxRd3TaJFYM2f8"); - boolean testnet = WalletManager.getInstance().isTestNet(); - if (!testnet) throw new IllegalStateException("Sending TX only on testnet. sorry."); - Helper.showKeyboard(getActivity()); etAddress.requestFocus(); etAddress.setOnEditorActionListener(new TextView.OnEditorActionListener() { diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java index 77633ad..1612f60 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java @@ -122,7 +122,7 @@ public class WalletFragment extends Fragment implements TransactionInfoAdapter.O } public void onSynced() { - if (!activityCallback.isWatchOnly() && WalletManager.getInstance().isTestNet()) { + if (!activityCallback.isWatchOnly()) { bSend.setVisibility(View.VISIBLE); bSend.setEnabled(true); } diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java b/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java index c574d2f..22d67d0 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java +++ b/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java @@ -341,10 +341,6 @@ public class WalletService extends Service { } else if (cmd.equals(REQUEST_CMD_SEND)) { Wallet myWallet = getWallet(); Log.d(TAG, "SEND TX for wallet: " + myWallet.getName()); - if (!myWallet.isTestNet()) { - Log.e(TAG, "Sending transactions only on testnet"); - throw new IllegalStateException("Sending transactions only in testnet"); - } PendingTransaction pendingTransaction = myWallet.getPendingTransaction(); if (pendingTransaction.getStatus() != PendingTransaction.Status.Status_Ok) { Log.e(TAG, "PendingTransaction is " + pendingTransaction.getStatus());