chat bug fix

Author: Sid Zi

app/src/main/java/com/sidzi/circleofmusic/adapters/ChatAdapter.java

@@ -33,46 +33,37 @@ public ChatAdapter(Context context) {
         super();
         mContext = context;
         chatMessageList = new ArrayList<>();
+        populate();
     }
 
-    public void populate(final String message) {
+    void populate() {
         RequestQueue rq = Volley.newRequestQueue(mContext);
-        JSONObject params;
-        String url;
-
-        final int method;
-        if (message == null) {
-            method = Request.Method.GET;
-            params = null;
-            url = "getMessages";
-        } else {
-            method = Request.Method.POST;
-            params = new JSONObject();
-            url = "postMessage";
-            try {
-                params.put("message_text", message);
-            } catch (JSONException e) {
-                e.printStackTrace();
+        BasicAuthJsonObjectRequest request = new BasicAuthJsonObjectRequest(mContext, Request.Method.GET, config.com_url + "getMessages", null, new Response.Listener<JSONObject>() {
+            @Override
+            public void onResponse(JSONObject response) {
+                addToArrayList(response);
             }
+        }, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError error) {
+                error.printStackTrace();
+            }
+        });
+        rq.add(request);
+    }
+
+    public void sendMessage(String message) {
+        JSONObject params = new JSONObject();
+        try {
+            params.put("message_text", message);
+        } catch (JSONException e) {
+            e.printStackTrace();
         }
-        BasicAuthJsonObjectRequest request = new BasicAuthJsonObjectRequest(mContext, method, config.com_url + url, params, new Response.Listener<JSONObject>() {
+        RequestQueue rq = Volley.newRequestQueue(mContext);
+        BasicAuthJsonObjectRequest request = new BasicAuthJsonObjectRequest(mContext, Request.Method.POST, config.com_url + "postMessage", params, new Response.Listener<JSONObject>() {
             @Override
             public void onResponse(JSONObject response) {
-                try {
-                    if (method == Request.Method.POST)
-                        populate(null);
-                    else {
-                        JSONArray messages_list = response.getJSONArray("messages");
-                        chatMessageList.clear();
-                        for (int i = 0; i < messages_list.length(); i++) {
-                            chatMessageList.add(new ChatMessage(messages_list.getJSONObject(i).getString("username"), messages_list.getJSONObject(i).getString("message_text")));
-                        }
-                        notifyDataSetChanged();
-                    }
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-
+                addToArrayList(response);
             }
         }, new Response.ErrorListener() {
             @Override
@@ -83,6 +74,19 @@ public void onErrorResponse(VolleyError error) {
         rq.add(request);
     }
 
+    private void addToArrayList(JSONObject response) {
+        try {
+            JSONArray messages_list = response.getJSONArray("messages");
+            chatMessageList.clear();
+            for (int i = 0; i < messages_list.length(); i++) {
+                chatMessageList.add(new ChatMessage(messages_list.getJSONObject(i).getString("username"), messages_list.getJSONObject(i).getString("message_text")));
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        notifyDataSetChanged();
+    }
+
     @Override
     public ChatAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         final View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.row_chat, parent, false);

app/src/main/java/com/sidzi/circleofmusic/fragments/ShoutboxFragment.java

@@ -22,7 +22,6 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         View homeView = inflater.inflate(R.layout.fragment_chat_bot, container, false);
         final RecyclerView chatRecyclerView = (RecyclerView) homeView.findViewById(R.id.rvChatConsole);
         final ChatAdapter chatAdapter = new ChatAdapter(getContext());
-        chatAdapter.populate(null);
         final LinearLayoutManager chatLayoutManager = new LinearLayoutManager(getContext());
 
         chatLayoutManager.setStackFromEnd(true);
@@ -37,7 +36,7 @@ public void onClick(View view) {
                 if (!message.equals("")) {
                     etChatMessage.setText("");
 //                    Send message to server here
-                    chatAdapter.populate(message);
+                    chatAdapter.sendMessage(message);
                 }
             }
         });

app/src/main/java/com/sidzi/circleofmusic/helpers/BasicAuthJsonObjectRequest.java

@@ -29,8 +29,6 @@ public Map<String, String> getHeaders() throws AuthFailureError {
         Map<String, String> params = new HashMap<>();
         params.put("Authorization", AuthToken);
         params.put("Username", UserName);
-        params.put("Content-Type", "application/json");
-        params.put("Accept", "application/json");
         return params;
     }
 }