Catch BitcoinRPCException on broadcastNetwork but ignore error code 0.

Author: caiofaustino

app/src/main/java/com/greenaddress/abcore/RPCIntentService.java

@@ -58,8 +58,10 @@ private String getRpcUrl() throws IOException {
         String password = p.getProperty("rpcpassword");
         final String testnet = p.getProperty("testnet");
         final String nonMainnet = testnet == null || !testnet.equals("1") ? p.getProperty("regtest") : testnet;
+
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         final String useDistribution = prefs.getString("usedistribution", "core");
+
         if (user == null || password == null) {
             final String cookie = String.format("%s/%s", p.getProperty("datadir"), ".cookie");
             final String cookieTestnet = String.format("%s/%s", p.getProperty("datadir"), "testnet3/.cookie");
@@ -68,12 +70,12 @@ private String getRpcUrl() throws IOException {
             final String daemon = "liquid".equals(useDistribution) ? cookieLiquid : cookie;
 
             final String fCookie = nonMainnet == null || !nonMainnet.equals("1") ? daemon : cookieTestnet;
-            final File file = new File(fCookie);
+            final File cookieFile = new File(fCookie);
 
             final StringBuilder text = new StringBuilder();
 
             try {
-                final BufferedReader br = new BufferedReader(new FileReader(file));
+                final BufferedReader br = new BufferedReader(new FileReader(cookieFile));
                 String line;
 
                 while ((line = br.readLine()) != null) {
@@ -119,15 +121,16 @@ private void broadcastPeerlist() throws IOException {
 
     }
 
-    private void broadcastNetwork() throws IOException {
+    private void broadcastNetwork() throws IOException, BitcoinRPCException {
         final BitcoindRpcClient bitcoin = getRpc();
         final Intent broadcastIntent = new Intent();
         broadcastIntent.setAction(MainActivity.RPCResponseReceiver.ACTION_RESP);
         broadcastIntent.addCategory(Intent.CATEGORY_DEFAULT);
         broadcastIntent.putExtra(PARAM_OUT_MSG, "localonion");
+
         final BitcoindRpcClient.NetworkInfo info = bitcoin.getNetworkInfo();
-        for (final Object addrs : info.localAddresses()) {
-            final Map data = (Map) addrs;
+        for (final Object address : info.localAddresses()) {
+            final Map data = (Map) address;
             final String host = (String) data.get("address");
             if (host != null && host.endsWith(".onion")) {
                 final Long port =  (Long) data.get("port");
@@ -139,14 +142,15 @@ private void broadcastNetwork() throws IOException {
                 break;
             }
         }
+
         final BitcoindRpcClient.BlockChainInfo blockChainInfo = bitcoin.getBlockChainInfo();
         broadcastIntent.putExtra("sync", blockChainInfo.verificationProgress().multiply(BigDecimal.valueOf(100)).intValue());
         broadcastIntent.putExtra("blocks", blockChainInfo.blocks());
         sendBroadcast(broadcastIntent);
     }
 
     private void broadcastError(final Exception e) {
-        Log.e(TAG, e.getClass().getName());
+        Log.e(TAG, "broadcastError - " + e.getClass().getName());
         final Intent broadcastIntent = new Intent();
         broadcastIntent.setAction(MainActivity.RPCResponseReceiver.ACTION_RESP);
         broadcastIntent.addCategory(Intent.CATEGORY_DEFAULT);
@@ -250,17 +254,26 @@ protected void onHandleIntent(final Intent intent) {
             sendBroadcast(broadcastIntent);
 
         } catch (final BitcoinRPCException | IOException i) {
-            Log.i(TAG, "EXE", i);
-
-            if (i instanceof BitcoinRPCException && (((BitcoinRPCException) i).getResponseCode() == 500)) {
-                final Intent broadcastIntent = new Intent();
-                broadcastIntent.setAction(MainActivity.RPCResponseReceiver.ACTION_RESP);
-                broadcastIntent.addCategory(Intent.CATEGORY_DEFAULT);
-                broadcastIntent.putExtra(PARAM_OUT_MSG, "OK");
-                sendBroadcast(broadcastIntent);
-                return;
+            if (i instanceof BitcoinRPCException) {
+                final BitcoinRPCException bitcoinRPCException = (BitcoinRPCException) i;
+                if (bitcoinRPCException.getResponseCode() == 500) {
+                    Log.d(TAG, "BitcoinRPCException - Internal Server Error");
+                    final Intent broadcastIntent = new Intent();
+                    broadcastIntent.setAction(MainActivity.RPCResponseReceiver.ACTION_RESP);
+                    broadcastIntent.addCategory(Intent.CATEGORY_DEFAULT);
+                    broadcastIntent.putExtra(PARAM_OUT_MSG, "OK");
+                    sendBroadcast(broadcastIntent);
+                    return;
+                } else if (bitcoinRPCException.getResponseCode() == 0){
+                    // This happens if Tor is yet initialized.
+                    Log.d(TAG, "Empty BitcoinRPCException");
+                    return;
+                } else {
+                    Log.e(TAG, "BitcoinRPCException", i);
+                }
+            } else {
+                Log.e(TAG, "IOException", i);
             }
-
             broadcastError(i);
         }
     }