Merge pull request #24 from m2049r/feature_spend_mainnet

mainnet spending
m2049r · Aug 29, 2017 · 30792c5 · 30792c5
2 parents c66ebd6 + 3846a0c
commit 30792c5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git 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 View onCreateView(LayoutInflater inflater, ViewGroup container,
         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
@@ -122,7 +122,7 @@ public void onRefreshed(final Wallet wallet, final boolean full) {
     }
 
     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
@@ -341,10 +341,6 @@ public void handleMessage(Message msg) {
                     } 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());