manual json parsing because gradle android plugin does not yet support proguard.cfg

Author: AEtherSurfer

src/main/java/com/github/bitcoinlabs/bitcoinmobileandroid/Outpoint.java

@@ -1,10 +1,11 @@
 package com.github.bitcoinlabs.bitcoinmobileandroid;
 
+
 public class Outpoint {
-    private String address;
-    private String hash;
-    private int n;
-    private long satoshis;
+    final private String address;
+    final private String hash;
+    final private int n;
+    final private long satoshis;
 
     public Outpoint(String address, String hash, int n, long satoshis) {
         super();
@@ -18,34 +19,18 @@ public String getAddress() {
         return address;
     }
 
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
     public String getHash() {
         return hash;
     }
 
-    public void setHash(String hash) {
-        this.hash = hash;
-    }
-
     public int getIndex() {
         return n;
     }
 
-    public void setIndex(int index) {
-        this.n = index;
-    }
-
     public long getSatoshis() {
         return satoshis;
     }
 
-    public void setSatoshis(long satoshis) {
-        this.satoshis = satoshis;
-    }
-
     @Override
     public String toString() {
         return "Outpoint [address=" + address + ", hash=" + hash + ", n=" + n

src/main/java/com/github/bitcoinlabs/bitcoinmobileandroid/OutpointService.java

@@ -3,6 +3,8 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -12,9 +14,14 @@
 import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
+import org.json.JSONObject;
 
 import com.google.bitcoin.core.Address;
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 
 import android.app.IntentService;
 import android.app.Notification;
@@ -135,7 +142,24 @@ protected void onHandleIntent(Intent outpointQueryIntent) {
             HttpEntity responseEntity = response.getEntity();
             InputStream content = responseEntity.getContent();
             Reader reader = new InputStreamReader(content);
-            outpointsResponse = gson.fromJson(reader, OutpointsResponse.class);
+//            gradle android plugin doesn't yet allow for custom proguard settings needed for gson.fromJson
+//            outpointsResponse = gson.fromJson(reader, OutpointsResponse.class);
+            JsonParser parser = new JsonParser();
+            JsonObject outpointsResponseJSON = parser.parse(reader).getAsJsonObject();
+            Log.i(getClass().getSimpleName()+"", outpointsResponseJSON+"");
+            long timestamp = 0;
+//            timestamp = outpointsResponseJSON.get("timestamp").getAsLong();
+            JsonArray outpointsJSON = outpointsResponseJSON.get("unspent_outpoints").getAsJsonArray();
+            List<Outpoint> outpoints = new ArrayList<Outpoint>(outpointsJSON.size());
+            for (JsonElement outpointJSON : outpointsJSON) {
+                String hash = outpointJSON.getAsJsonObject().get("hash").getAsString();
+                int n = outpointJSON.getAsJsonObject().get("n").getAsInt();
+                long satoshis = outpointJSON.getAsJsonObject().get("satoshis").getAsLong();
+                String opAddress = outpointJSON.getAsJsonObject().get("address").getAsString();
+                Outpoint outpoint = new Outpoint(opAddress, hash, n, satoshis);
+                outpoints.add(outpoint);
+            }
+            outpointsResponse = new OutpointsResponse(timestamp, outpoints);
             wallet.add(outpointsResponse);
             Log.i(getClass().getSimpleName()+"", outpointsResponse+"");
         } catch (Exception e) {

src/main/java/com/github/bitcoinlabs/bitcoinmobileandroid/WalletOpenHelper.java

@@ -117,7 +117,6 @@ public Address getUnusedAddress() {
         if (cursor.getCount() > 0) {
             cursor.moveToNext();
             String addressString = cursor.getString(0);
-            cursor.close();
             try {
                 btcAddress = new Address(NetworkParameters.prodNet(), addressString);
             } catch (AddressFormatException e) {
@@ -126,29 +125,33 @@ public Address getUnusedAddress() {
         } else {
             btcAddress = newKey();
         }
+        cursor.close();
+        db.close();
         return btcAddress;
     }
 
     public void add(OutpointsResponse outpointsResponse) {
-        SQLiteDatabase db = getWritableDatabase();
         Collection<Outpoint> outpoints = outpointsResponse.getUnspent_outpoints();
-        for (Outpoint outpoint : outpoints) {
-            outpoint.getAddress();
-            try {
-                ContentValues values = new ContentValues();
-                values.put(HASH, Utils.hexStringToBytes(outpoint.getHash()));
-                values.put(ADDRESS, outpoint.getAddress());
-                values.put(N, outpoint.getIndex());
-                values.put(SATOSHIS, outpoint.getSatoshis());
-                db.insertOrThrow("outpoints", null, values );
-            } catch (SQLiteConstraintException e) {
-                //do nothing as we will assume we already have a record of this outpoint.
-                //TODO verify that we have the right ADDRESS and SATOSHIS for this outpoint
+        if (outpoints != null && outpoints.size() > 0) {
+            SQLiteDatabase db = getWritableDatabase();
+            for (Outpoint outpoint : outpoints) {
+                outpoint.getAddress();
+                try {
+                    ContentValues values = new ContentValues();
+                    values.put(HASH, Utils.hexStringToBytes(outpoint.getHash()));
+                    values.put(ADDRESS, outpoint.getAddress());
+                    values.put(N, outpoint.getIndex());
+                    values.put(SATOSHIS, outpoint.getSatoshis());
+                    db.insertOrThrow("outpoints", null, values );
+                } catch (SQLiteConstraintException e) {
+                    //do nothing as we will assume we already have a record of this outpoint.
+                    //TODO verify that we have the right ADDRESS and SATOSHIS for this outpoint
+                }
             }
+            db.close();
         }
-        db.close();
     }
-    
+
     public long getBalance() {
         long satoshis = 0;
         SQLiteDatabase db = getReadableDatabase();