Improved Mysql shell UI

Author: Shushant

Diff for: src/org/opendroidphp/app/ui/SQLShellFragment.java renamed to src/org/opendroidphp/app/ui/QueryFragment.java

@@ -10,29 +10,26 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockFragment;
 
 import org.apache.commons.io.IOUtils;
 import org.opendroidphp.R;
 import org.opendroidphp.app.AppController;
 import org.opendroidphp.app.Constants;
-import org.opendroidphp.app.common.utils.ShellOutputFormatter;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 
-public class SQLShellFragment extends SherlockFragment implements View.OnClickListener {
+public class QueryFragment extends SherlockFragment implements View.OnClickListener {
 
     private static InputStream stdout;
     private static OutputStream stdin;
-    private Button mRunCommand;
-    private TextView mResult;
-    private EditText mCommand;
+    private Button mBtnQuery;
+    private EditText mQuery;
     private Process process;
 
     @Override
@@ -41,7 +38,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         View view = inflater.inflate(R.layout.fragment_mysql, container, false);
         prepareView(view);
 
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getSherlockActivity());
+        SharedPreferences preferences = PreferenceManager.
+                getDefaultSharedPreferences(getSherlockActivity());
 
         final String username = preferences.getString("mysql_username", "root");
         final String password = preferences.getString("mysql_password", "");
@@ -52,18 +50,14 @@ public void run() {
                 initializeShell(username, password);
             }
         }).start();
-
         new AsyncCommandTask().execute();
-
         return view;
     }
 
     protected void prepareView(View view) {
-        mRunCommand = (Button) view.findViewById(R.id.run_cmd);
-        mResult = (TextView) view.findViewById(R.id.shell_result);
-        mCommand = (EditText) view.findViewById(R.id.command);
-
-        mRunCommand.setOnClickListener(this);
+        mQuery = (EditText) view.findViewById(R.id.create_mysql_query);
+        mBtnQuery = (Button) view.findViewById(R.id.btn_execute_query);
+        mBtnQuery.setOnClickListener(this);
     }
 
     protected Process initializeShell(final String username, final String password) {
@@ -80,15 +74,14 @@ protected Process initializeShell(final String username, final String password)
         } catch (IOException e) {
             e.printStackTrace();
             AppController.toast(getSherlockActivity(), "Unable to run sql server");
-            // process.destroy();
         }
         return process;
     }
 
     @Override
     public void onClick(View view) {
         if (stdin == null || process == null) return;
-        String command = mCommand.getText().toString();
+        String command = mQuery.getText().toString();
         try {
             stdin.write((command + "\r\n").getBytes());
             stdin.flush();
@@ -97,16 +90,16 @@ public void onClick(View view) {
         }
     }
 
+
     private class AsyncCommandTask extends AsyncTask<Void, String, Void> {
         @Override
         protected Void doInBackground(Void... params) {
             if (stdout == null || process == null) return null;
-
             BufferedReader buff = new BufferedReader(
                     new InputStreamReader(stdout));
             try {
                 while (true) {
-                    String stream = ShellOutputFormatter.toHTML(buff.readLine());
+                    String stream = buff.readLine();
                     if (stream == null) break;
                     publishProgress(stream);
                 }
@@ -121,7 +114,7 @@ protected Void doInBackground(Void... params) {
         @Override
         protected void onProgressUpdate(String... values) {
             super.onProgressUpdate(values);
-            mResult.append(ShellOutputFormatter.toHTML(values[0]));
+            mQuery.append(values[0]);
         }
     }
 }