From 0eac47a3478bba6030d76d7a254f550397fed43f Mon Sep 17 00:00:00 2001
From: Ricky Barrette <rickbarrette@gmail.com>
Date: Sat, 6 Oct 2012 11:19:41 -0400
Subject: [PATCH] I can now display threads from the database

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
---
 OSJ Forum/AndroidManifest.xml                 |  2 +-
 .../osj/forum/content/ThreadAdapter.java      |  6 ++---
 .../osj/forum/content/ThreadContent.java      | 23 ++++++-----------
 .../osj/forum/content/TopicContent.java       |  3 ---
 .../osj/forum/database/ForumDatabase.java     | 25 +++++++++++++++++++
 5 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/OSJ Forum/AndroidManifest.xml b/OSJ Forum/AndroidManifest.xml
index 52608d1..50055a0 100644
--- a/OSJ Forum/AndroidManifest.xml	
+++ b/OSJ Forum/AndroidManifest.xml	
@@ -1,5 +1,5 @@
 <manifest package="org.RickBarrette.osj.forum"
-    android:versionCode="302"
+    android:versionCode="305"
     android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
 
     <uses-sdk
diff --git a/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadAdapter.java b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadAdapter.java
index 495cdef..2943bc2 100644
--- a/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadAdapter.java	
+++ b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadAdapter.java	
@@ -126,9 +126,9 @@ public class ThreadAdapter extends BaseAdapter {
 		 * always call setChecked() after calling setOnCheckedChangedListener.
 		 * This will prevent the list from changing the values on you.
 		 */
-		holder.title.setText(new String((byte[]) getItem(position).get("post_title")));
-		holder.user.setText(new String((byte[]) getItem(position).get("post_author_name")));
-		holder.post.setText(new String((byte[]) getItem(position).get("post_content")));
+		holder.title.setText((String) getItem(position).get("post_title"));
+		holder.user.setText((String) getItem(position).get("post_author_name"));
+		holder.post.setText((String) getItem(position).get("post_content"));
 
 		return convertView;
 	}
diff --git a/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadContent.java b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadContent.java
index cbb4954..efe6bb5 100644
--- a/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadContent.java	
+++ b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadContent.java	
@@ -25,8 +25,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.RickBarrette.osj.forum.Log;
-import org.xmlrpc.android.XMLRPCClient;
-import org.xmlrpc.android.XMLRPCException;
+import org.RickBarrette.osj.forum.database.ForumDatabase;
 
 import android.content.Context;
 
@@ -87,23 +86,15 @@ public class ThreadContent {
 	 * @author ricky barrette
 	 */
 	public static void getThread(final String topicId, final int startNumber, final int lastNumber, final Context context) {
-		final XMLRPCClient client = XMLRPCClient.getClient(context);
-
 		ITEMS.clear();
 		ITEM_MAP.clear();
+		
+		final ForumDatabase db = new ForumDatabase(context);
+		List<String> list = db.getThreads();
 
-		Object[] result = null;
-		try {
-			result = (Object[]) ((HashMap<?, ?>) client.call("get_thread", topicId, startNumber, lastNumber)).get("posts");
-		} catch (final XMLRPCException e) {
-			e.printStackTrace();
-		}
-
-		if (result != null)
-			for (int i = 0; i < result.length; i++) {
-				final HashMap<?, ?> contentHash = (HashMap<?, ?>) result[i];
-				addItem(new ThreadItem(Integer.valueOf(i).toString(), contentHash));
-			}
+		int index = 0;
+		for(String item : list)
+			addItem(new ThreadItem(Integer.valueOf(index++).toString(), db.getThread(item)));
 	}
 
 }
diff --git a/OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicContent.java b/OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicContent.java
index 13eeb8e..d2fd0cc 100644
--- a/OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicContent.java	
+++ b/OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicContent.java	
@@ -25,10 +25,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.RickBarrette.osj.forum.Log;
-import org.RickBarrette.osj.forum.content.ForumContent.ForumItem;
 import org.RickBarrette.osj.forum.database.ForumDatabase;
-import org.xmlrpc.android.XMLRPCClient;
-import org.xmlrpc.android.XMLRPCException;
 
 import android.content.Context;
 
diff --git a/OSJ Forum/src/org/RickBarrette/osj/forum/database/ForumDatabase.java b/OSJ Forum/src/org/RickBarrette/osj/forum/database/ForumDatabase.java
index 560301f..030da5a 100644
--- a/OSJ Forum/src/org/RickBarrette/osj/forum/database/ForumDatabase.java	
+++ b/OSJ Forum/src/org/RickBarrette/osj/forum/database/ForumDatabase.java	
@@ -391,6 +391,21 @@ public class ForumDatabase {
 		return list;
 	}
 	
+	/**
+	 * Retrieves a list of thread ids
+	 * @return
+	 * @author ricky barrette
+	 */
+	public List<String> getThreads(){
+		ArrayList<String> list = new ArrayList<String>();
+		Cursor c = mDb.query(TABLE_THREADS, new String[] { KEY_ID }, null, null, null, null, null);
+		if(c.moveToFirst())
+			do{
+				list.add(c.getString(0));
+			} while(c.moveToNext());
+		return list;
+	}
+	
 	/**
 	 * Retrieves a forum from the database
 	 * @param id
@@ -411,6 +426,16 @@ public class ForumDatabase {
 		return cursorToHashMap(mDb.query(TABLE_TOPIC_INFO, new String[] { KEY, KEY_VALUE }, KEY_TOPIC_ID +" = "+ DatabaseUtils.sqlEscapeString(id), null, null, null, null));
 	}
 	
+	/**
+	 * Retrieves a post from the threads table of the database
+	 * @param id
+	 * @return
+	 * @author ricky barrette
+	 */
+	public HashMap<String, String> getThread(String id) {
+		return cursorToHashMap(mDb.query(TABLE_THREAD_INFO, new String[] { KEY, KEY_VALUE }, KEY_POST_ID +" = "+ DatabaseUtils.sqlEscapeString(id), null, null, null, null));
+	}
+	
 	/**
 	 * Converts a cursor with key-value pairs into a hash map
 	 * @param c