From 509bd14bf5d23070be385c826b4405f637dd05cd Mon Sep 17 00:00:00 2001
From: Daniel Erat <dan@erat.org>
Date: Tue, 15 Mar 2011 07:11:51 -0700
Subject: [PATCH] android: add custom browse row layout

---
 clients/android/res/layout/browse_row.xml             | 11 +++++++++++
 .../android/src/org/camlistore/BrowseActivity.java    |  8 +++++---
 .../android/src/org/camlistore/DownloadService.java   |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 clients/android/res/layout/browse_row.xml

diff --git a/clients/android/res/layout/browse_row.xml b/clients/android/res/layout/browse_row.xml
new file mode 100644
index 000000000..1fba0d56c
--- /dev/null
+++ b/clients/android/res/layout/browse_row.xml
@@ -0,0 +1,11 @@
+<!-- cribbed from simple_list_item_1 -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceLarge"
+    android:gravity="center_vertical"
+    android:paddingLeft="6dip"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:singleLine="true"
+    />
diff --git a/clients/android/src/org/camlistore/BrowseActivity.java b/clients/android/src/org/camlistore/BrowseActivity.java
index 4dcb5910c..73986c9a8 100644
--- a/clients/android/src/org/camlistore/BrowseActivity.java
+++ b/clients/android/src/org/camlistore/BrowseActivity.java
@@ -76,7 +76,9 @@ public class BrowseActivity extends ListActivity {
         @Override
         public void onBlobDownloadComplete(final String blobRef, final InputStream stream) {
             try {
-                JSONObject object = (JSONObject) new JSONTokener(Util.slurp(stream)).nextValue();
+                String data = Util.slurp(stream);
+                Log.d(TAG, "got search results: " + data);
+                JSONObject object = (JSONObject) new JSONTokener(data).nextValue();
                 JSONArray array = object.getJSONArray("results");
                 if (array == null) {
                     Log.e(TAG, "search results are missing results key");
@@ -241,9 +243,9 @@ public class BrowseActivity extends ListActivity {
         mAdapter = new SimpleAdapter(
             this,
             mEntries,
-            android.R.layout.simple_list_item_1,
+            R.layout.browse_row,
             new String[]{ KEY_TITLE },
-            new int[]{ android.R.id.text1 });
+            new int[]{ android.R.id.title });
         setListAdapter(mAdapter);
     }
 
diff --git a/clients/android/src/org/camlistore/DownloadService.java b/clients/android/src/org/camlistore/DownloadService.java
index 8ad5095bb..8fc2ffe99 100644
--- a/clients/android/src/org/camlistore/DownloadService.java
+++ b/clients/android/src/org/camlistore/DownloadService.java
@@ -121,7 +121,7 @@ public class DownloadService extends Service {
                 if (response.getStatusLine().getStatusCode() != 200) {
                     Log.e(TAG,
                           "got status code " + response.getStatusLine().getStatusCode() +
-                          "while downloading " + mBlobRef);
+                          " while downloading " + mBlobRef);
                     handleFailure();
                     return;
                 }