From 653f137a99b97afce093fec72e415abfb8aa2a6f Mon Sep 17 00:00:00 2001 From: Toby Woerthle Date: Wed, 24 Jan 2018 00:16:15 -0500 Subject: [PATCH] Wallet Balance Check Fix + Private Testnet is now default node -Fixed key index change check and storage, which fixes balance value -Cleaned up println statements -Made (private) testnet default to true --- .../Requests/WalletAddressChecker.java | 19 +------------ .../Requests/WalletBalanceChecker.java | 28 ------------------- .../Requests/WalletTestnetTokenGen.java | 5 ---- .../Requests/WalletTransferRequest.java | 2 -- app/src/main/res/xml/preferences.xml | 2 +- 5 files changed, 2 insertions(+), 54 deletions(-) diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java index 6c4e7ee..bf7da79 100644 --- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java +++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletAddressChecker.java @@ -76,14 +76,12 @@ public class WalletAddressChecker { SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context); String security = prefManager.getString("pref_key_security","2"); int securityInt = Integer.parseInt(security); - System.out.println("securityInt: "+securityInt); addressResponse = api.getNewAddress(seed, securityInt, keyIndex, true, 1, false); } catch (ArgumentException e) { e.printStackTrace(); } if(addressResponse != null) { - System.out.println("WalletAddressChecker - Address: "+addressResponse.getAddresses().get(0)); addressList.add(addressResponse.getAddresses().get(0)); String[] addressesCheckArray = new String[1]; @@ -110,11 +108,6 @@ public class WalletAddressChecker { String curHash = transactionsForAddress.get(0).getHash(); hashStringList.add(curHash); - - System.out.println("WalletAddressChecker value: "+transactionsForAddress.get(0).getValue()); - System.out.println("WalletAddressChecker time: "+transactionsForAddress.get(0).getAttachmentTimestamp()); - System.out.println("WalletAddressChecker address: "+transactionsForAddress.get(0).getAddress()); - keyIndex = keyIndex + 1; } } @@ -143,21 +136,11 @@ public class WalletAddressChecker { e.printStackTrace(); } - System.out.println("containsPendingTransaction: "+containsPendingTransaction); - if(!containsPendingTransaction){ //all confirmed transactions, ok to change keyIndex - if(keyIndex != getKeyIndex()){ keyIndexChanged = true; - if(keyIndex == 0){ - //Put the initial address to search. No transactions for the seed yet. - putKeyIndex(keyIndex); - } - else{ - //Put the second last address to search - putKeyIndex(keyIndex-1); - } + putKeyIndex(keyIndex); } } diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java index e7519a5..4831671 100644 --- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java +++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletBalanceChecker.java @@ -83,8 +83,6 @@ public class WalletBalanceChecker extends AsyncTask { boolean containsPendingTransactions = addressChecker.getContainsPendingTransaction(); boolean keyIndexChanged = addressChecker.getkeyIndexChanged(); - System.out.println("seed: "+seed); - if(addressList != null && addressList.get(0).equals("Unable to resolve host")){ AddressBalanceTransfer addressBalanceTransfer = new AddressBalanceTransfer(null,null,"hostError"); Message completeMessage = mHandler.obtainMessage(BALANCE_RETRIEVE_TASK_COMPLETE, addressBalanceTransfer); @@ -126,10 +124,6 @@ public class WalletBalanceChecker extends AsyncTask { public String getBalance(List inAddresses, boolean containsPendingTransactions, boolean keyIndexChanged){ - for (String inAddress : inAddresses) { - System.out.println("addressGetBalance: "+inAddress); - } - String updatedBalanceString; try { StopWatch stopWatch = new StopWatch(); @@ -140,11 +134,7 @@ public class WalletBalanceChecker extends AsyncTask { GetBalancesAndFormatResponse balanceResponse = api.getBalanceAndFormat(inAddresses, 0, 0, stopWatch, securityInt); long total = balanceResponse.getTotalBalance(); - System.out.println("getTotalBalance: "+total); - long storedBaseBalance = Long.parseLong(getBaseSharedPrefKeyBalance()); - System.out.println("getBaseSharedPreKeyBalance: "+storedBaseBalance); - long updatedBaseBalance = storedBaseBalance + total; updatedBalanceString = Long.toString(updatedBaseBalance); @@ -163,10 +153,6 @@ public class WalletBalanceChecker extends AsyncTask { //No Pending Transactions, new confirmed transactions else if(!containsPendingTransactions && keyIndexChanged){ putBaseSharedPrefBalance(updatedBalanceString); - - System.out.println("Store new base balance"); - System.out.println("updated balance: "+updatedBaseBalance); - updatedBalanceString = Long.toString(updatedBaseBalance); putSharedPrefBalance(updatedBalanceString); } @@ -177,17 +163,6 @@ public class WalletBalanceChecker extends AsyncTask { return updatedBalanceString; } - private String getSharedPrefKeyBalance() { - SharedPreferences sharedPref = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE); - int keyIndex = sharedPref.getInt("keyIndex",0); - - System.out.println("KeyIndex: "+keyIndex); - - String defaultValue = "0"; - String storedBalance = sharedPref.getString("balance",defaultValue); - return storedBalance; - } - private void putSharedPrefBalance(String inBalance) { SharedPreferences sharedPref = context.getSharedPreferences( prefFile, Context.MODE_PRIVATE); @@ -199,9 +174,6 @@ public class WalletBalanceChecker extends AsyncTask { private String getBaseSharedPrefKeyBalance() { SharedPreferences sharedPref = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE); int keyIndex = sharedPref.getInt("keyIndex",0); - - System.out.println("KeyIndex: "+keyIndex); - String defaultValue = "0"; String storedBalance = sharedPref.getString("baseBalance",defaultValue); return storedBalance; diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java index f905aa8..727268f 100644 --- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java +++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTestnetTokenGen.java @@ -148,8 +148,6 @@ public class WalletTestnetTokenGen extends AsyncTask { private void transferToWallet(List destAddressses, TokenGenJSONResponse token) { - System.out.println("2000 seed: "+token.getSeed()); - if(destAddressses != null && destAddressses.get(0).equals("Unable to resolve host")){ //Host Error Message completeMessage = settingsFragmentHandler.obtainMessage(TOKEN_TESTNET_RETRIEVE_TASK_COMPLETE, "hostError"); @@ -161,9 +159,6 @@ public class WalletTestnetTokenGen extends AsyncTask { completeMessage.sendToTarget(); String destAddress = destAddressses.get(destAddressses.size()-1); - System.out.println("DestAddress: "+destAddress); - System.out.println("TokenAmt: "+token.getAmount().toString()); - WalletTransferRequest transferRequest = new WalletTransferRequest(destAddress,token.getSeed(),token.getAmount().toString(),"","",context,testnetTokenGenHandler); transferRequest.execute(); } diff --git a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java index e5d00dd..0720dd5 100644 --- a/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java +++ b/app/src/main/java/com/flashwifi/wifip2p/iotaAPI/Requests/WalletTransferRequest.java @@ -107,7 +107,6 @@ public class WalletTransferRequest extends AsyncTask { try { if(testnet) { //Testnet - System.out.println("WalletTransferRequest: Testnet"); if(testnetPrivate){ sendTransferResponse = api.sendTransfer(appWalletSeed, securityInt, 4, 3, transfers, null, null, false); } @@ -155,7 +154,6 @@ public class WalletTransferRequest extends AsyncTask { else{ transferResult = "Transfer error: Send Response not received"; } - System.out.println("WalletTransferRequest - result: "+transferResult); return transferResult; } } diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 195783d..a5f5ace 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -44,7 +44,7 @@