From 0b5f25a2ddb36d3d03317c2a7ae3986c648dd84e Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Fri, 10 Jan 2014 17:24:10 +0200
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BF=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D0=B2=D1=8B=D0=B1=D1=80=D0=B0=D0=BD=D0=BD=D0=BE=D0=B9?=
 =?UTF-8?q?=20=D1=82=D0=B5=D0=BC=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/annimon/client/tasks/ForumLoader.java |  1 +
 src/com/annimon/client/utils/ApiUtils.java    | 52 +++++++++++++++----
 2 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/com/annimon/client/tasks/ForumLoader.java b/src/com/annimon/client/tasks/ForumLoader.java
index 755e652..c89fc4c 100644
--- a/src/com/annimon/client/tasks/ForumLoader.java
+++ b/src/com/annimon/client/tasks/ForumLoader.java
@@ -48,6 +48,7 @@ public class ForumLoader<T> extends AsyncTask<Integer, Void, List<T>> {
         
     	if (params[0] == MODE_POSTS) {
     	    int topicId = params[1];
+    	    return (List<T>) ApiUtils.getForumPosts(topicId);
     	}
     	
     	return null;
diff --git a/src/com/annimon/client/utils/ApiUtils.java b/src/com/annimon/client/utils/ApiUtils.java
index 813b4fe..694d318 100644
--- a/src/com/annimon/client/utils/ApiUtils.java
+++ b/src/com/annimon/client/utils/ApiUtils.java
@@ -6,7 +6,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.HttpClient;
@@ -18,19 +17,17 @@ import org.apache.http.util.EntityUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Base64;
 import com.annimon.client.R;
 import com.annimon.client.entities.ForumPost;
 import com.annimon.client.entities.ForumSection;
 import com.annimon.client.entities.ForumTopic;
 import com.annimon.client.tasks.ForumLoader;
 
-import android.content.Context;
-import android.text.TextUtils;
-import android.util.Base64;
-
 /**
- * Common utilities for working with server. 
+ * Функции для работы с API сайта. 
  * @author aNNiMON
  */
 public class ApiUtils {
@@ -99,9 +96,45 @@ public class ApiUtils {
                 topics.add(post);
             }
         } catch (IOException ex) {
-            ExceptionHandler.log("getLastPosts", ex);
+            ExceptionHandler.log("getTopics", ex);
         } catch (JSONException ex) {
-            ExceptionHandler.log("getLastPosts", ex);
+            ExceptionHandler.log("getTopics", ex);
+        }
+        return topics;
+    }
+    
+    /**
+     * Получение постов выбранной темы.
+     * @param topic id темы на форуме
+     * @return arraylist 
+     */
+    public static List<ForumPost> getForumPosts(int topic) {
+        List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>();
+        nameValuePairs.add(new BasicNameValuePair("key", getKey(ApiForum.CLASS)));
+        nameValuePairs.add(new BasicNameValuePair("act", ApiForum.ACT_GET_POSTS));
+        nameValuePairs.add(new BasicNameValuePair("topic", String.valueOf(topic)));
+        
+        List<ForumPost> topics = new ArrayList<ForumPost>();
+        try {
+            HttpResponse response = sendPost(ApiForum.PATH, nameValuePairs);
+            String text = EntityUtils.toString(response.getEntity());
+            if (TextUtils.isEmpty(text)) return topics;
+            
+            JSONArray jsonArray = new JSONArray(text);
+            for (int i = 0; i < jsonArray.length(); i++) {
+                JSONObject jsonObject = jsonArray.getJSONObject(i);
+                ForumPost post = new ForumPost();
+                post.setTopicId(topic);
+                post.setTopicTitle("");
+                post.setDate(jsonObject.getInt("time"));
+                post.setAuthor(jsonObject.getString("user"));
+                post.setMessage(jsonObject.getString("text"));
+                topics.add(post);
+            }
+        } catch (IOException ex) {
+            ExceptionHandler.log("getForumPosts", ex);
+        } catch (JSONException ex) {
+            ExceptionHandler.log("getForumPosts", ex);
         }
         return topics;
     }
@@ -172,6 +205,7 @@ public class ApiUtils {
         private static final String CLASS = "forum";
         private static final String PATH = API_PATH + CLASS + PHP;
         private static final String ACT_GET_TOPICS = "get_topics";
+        private static final String ACT_GET_POSTS = "get_posts";
         private static final String ACT_LAST_POSTS = "last_posts";
     }