Merge branch 'codebymikey-master'

Author: amitshekhariitbhu

debug-db/src/main/java/com/amitshekhar/model/Response.java

@@ -28,7 +28,7 @@
 
 public class Response {
 
-    public List rows = new ArrayList();
+    public List<Object> rows = new ArrayList<>();
     public List<String> columns = new ArrayList<>();
     public boolean isSuccessful;
     public String error;

debug-db/src/main/java/com/amitshekhar/server/ClientServer.java

@@ -26,6 +26,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.pm.LabeledIntent;
 import android.content.res.AssetManager;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
@@ -49,6 +50,7 @@
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -372,17 +374,17 @@ private Response query(String sql) {
 
             if (cursor.getCount() > 0) {
                 do {
-                    List row = new ArrayList();
+                    List<Object> row = new ArrayList<>();
                     for (int i = 0; i < cursor.getColumnCount(); i++) {
                         switch (cursor.getType(i)) {
                             case Cursor.FIELD_TYPE_BLOB:
                                 row.add(cursor.getBlob(i));
                                 break;
                             case Cursor.FIELD_TYPE_FLOAT:
-                                row.add(Float.valueOf(cursor.getFloat(i)));
+                                row.add(cursor.getFloat(i));
                                 break;
                             case Cursor.FIELD_TYPE_INTEGER:
-                                row.add(Integer.valueOf(cursor.getInt(i)));
+                                row.add(cursor.getInt(i));
                                 break;
                             case Cursor.FIELD_TYPE_STRING:
                                 row.add(cursor.getString(i));
@@ -395,7 +397,7 @@ private Response query(String sql) {
 
                 } while (cursor.moveToNext());
             }
-
+            cursor.close();
             return response;
         } else {
             Response response = new Response();
@@ -408,8 +410,9 @@ private Response query(String sql) {
     public Response getDBList() {
         Response response = new Response();
         if (mDatabaseDir != null) {
-            for (String name : mDatabaseDir.list()) {
-                response.rows.add(name);
+            String[] list = mDatabaseDir.list();
+            if(list != null) {
+                Collections.addAll(response.rows, list);
             }
         }
         response.rows.add(Constants.APP_SHARED_PREFERENCES);
@@ -427,6 +430,7 @@ public Response getAllTableName() {
                 c.moveToNext();
             }
         }
+        c.close();
         response.isSuccessful = true;
         return response;
     }
@@ -450,7 +454,7 @@ public Response getAllPrefData(String tag) {
         SharedPreferences preferences = mContext.getSharedPreferences(tag, Context.MODE_PRIVATE);
         Map<String, ?> allEntries = preferences.getAll();
         for (Map.Entry<String, ?> entry : allEntries.entrySet()) {
-            List row = new ArrayList();
+            List<String> row = new ArrayList<>();
             row.add(entry.getKey());
             row.add(entry.getValue().toString());
             response.rows.add(row);