diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseFragment.java b/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseFragment.java index 91a6ff4..428afa3 100644 --- a/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseFragment.java +++ b/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseFragment.java @@ -17,14 +17,14 @@ import android.widget.TextView; import java.util.List; -import info.nerull7.mysqlbrowser.db.AsyncDatabaseConnector; +import info.nerull7.mysqlbrowser.db.DatabaseConnector; /** * Created by nerull7 on 14.07.14. * * Fragment for showing list of Available Databases for user */ -public class DatabaseFragment extends Fragment implements AdapterView.OnItemClickListener, AsyncDatabaseConnector.ListReturnListener, AsyncDatabaseConnector.OnPostExecuteListener { +public class DatabaseFragment extends Fragment implements AdapterView.OnItemClickListener, DatabaseConnector.ListReturnListener, DatabaseConnector.OnPostExecuteListener { private ListView databasesListView; private ListAdapter listAdapter; private RelativeLayout rootView; @@ -34,7 +34,7 @@ public class DatabaseFragment extends Fragment implements AdapterView.OnItemClic @Override public void onResume() { super.onResume(); - Static.asyncDatabaseConnector.setDatabaseInUse(null); + Static.databaseConnector.setDatabaseInUse(null); } @Override @@ -45,9 +45,9 @@ public class DatabaseFragment extends Fragment implements AdapterView.OnItemClic this.rootView = (RelativeLayout) rootView; progressBar = (ProgressBar) rootView.findViewById(R.id.loginProgressBar); - Static.asyncDatabaseConnector.setListReturnListener(this); - Static.asyncDatabaseConnector.setOnPostExecuteListener(this); - Static.asyncDatabaseConnector.getDatabases(); + Static.databaseConnector.setListReturnListener(this); + Static.databaseConnector.setOnPostExecuteListener(this); + Static.databaseConnector.getDatabases(); return rootView; } @@ -59,7 +59,7 @@ public class DatabaseFragment extends Fragment implements AdapterView.OnItemClic Intent intent = new Intent(getActivity(), ListActivity.class); intent.putExtra(Static.FRAGMENT_TO_START, Static.FRAGMENT_TABLE); intent.putExtra(Static.DATABASE_NAME_ARG, chosenDatabase); - Static.asyncDatabaseConnector.setDatabaseInUse(chosenDatabase); + Static.databaseConnector.setDatabaseInUse(chosenDatabase); startActivity(intent); } else { Static.showErrorAlert(getResources().getString(R.string.no_connection), getActivity()); diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/ElementFragment.java b/app/src/main/java/info/nerull7/mysqlbrowser/ElementFragment.java index a9f2953..236c769 100644 --- a/app/src/main/java/info/nerull7/mysqlbrowser/ElementFragment.java +++ b/app/src/main/java/info/nerull7/mysqlbrowser/ElementFragment.java @@ -5,7 +5,6 @@ import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -14,22 +13,19 @@ import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; import android.widget.AbsListView; -import android.widget.EditText; import android.widget.ListView; import android.widget.ProgressBar; -import android.widget.RelativeLayout; -import java.util.ArrayList; import java.util.List; -import info.nerull7.mysqlbrowser.db.AsyncDatabaseConnector; +import info.nerull7.mysqlbrowser.db.DatabaseConnector; /** * Created by nerull7 on 2014-08-06. * * Fragment for editing/adding elements */ -public class ElementFragment extends Fragment implements AsyncDatabaseConnector.ListReturnListener, AsyncDatabaseConnector.StringReturnListener, AsyncDatabaseConnector.OnPostExecuteListener { +public class ElementFragment extends Fragment implements DatabaseConnector.ListReturnListener, DatabaseConnector.StringReturnListener, DatabaseConnector.OnPostExecuteListener { public static final String EDIT_ELEMENT = "edit_element"; public static final String EDIT_LIST = "edit_element_list"; @@ -73,32 +69,32 @@ public class ElementFragment extends Fragment implements AsyncDatabaseConnector. initArguments(); postExecute = POST_EXECUTE_NONE; - Static.asyncDatabaseConnector.setListReturnListener(this); - Static.asyncDatabaseConnector.setOnPostExecuteListener(this); - Static.asyncDatabaseConnector.getFields(tableName); + Static.databaseConnector.setListReturnListener(this); + Static.databaseConnector.setOnPostExecuteListener(this); + Static.databaseConnector.getFields(tableName); return rootView; } private void actionSave(){ List<String> fields = listAdapter.getFieldArray(); - Static.asyncDatabaseConnector.setStringReturnListener(this); + Static.databaseConnector.setStringReturnListener(this); if(getArguments().getBoolean(EDIT_ELEMENT)) - Static.asyncDatabaseConnector.updateElement(tableName, fields, values, listAdapter.getValues()); + Static.databaseConnector.updateElement(tableName, fields, values, listAdapter.getValues()); else - Static.asyncDatabaseConnector.addNewElement(tableName, fields, listAdapter.getValues()); + Static.databaseConnector.addNewElement(tableName, fields, listAdapter.getValues()); } private void actionRemove(){ final List<String> fields = listAdapter.getFieldArray(); - Static.asyncDatabaseConnector.setStringReturnListener(this); + Static.databaseConnector.setStringReturnListener(this); final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setMessage(R.string.error_remove); builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { - Static.asyncDatabaseConnector.removeElement(tableName, fields, values); + Static.databaseConnector.removeElement(tableName, fields, values); // getActivity().finish(); } }); diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/EntriesFragment.java b/app/src/main/java/info/nerull7/mysqlbrowser/EntriesFragment.java index 9bf12ef..3c8a5b9 100644 --- a/app/src/main/java/info/nerull7/mysqlbrowser/EntriesFragment.java +++ b/app/src/main/java/info/nerull7/mysqlbrowser/EntriesFragment.java @@ -24,14 +24,14 @@ import android.widget.TextView; import java.util.ArrayList; import java.util.List; -import info.nerull7.mysqlbrowser.db.AsyncDatabaseConnector; +import info.nerull7.mysqlbrowser.db.DatabaseConnector; /** * Created by nerull7 on 15.07.14. * * Fragment for showing elements */ -public class EntriesFragment extends Fragment implements AsyncDatabaseConnector.MatrixReturnListener, AsyncDatabaseConnector.ListReturnListener, AsyncDatabaseConnector.IntegerReturnListener, View.OnClickListener, AsyncDatabaseConnector.OnPostExecuteListener { +public class EntriesFragment extends Fragment implements DatabaseConnector.MatrixReturnListener, DatabaseConnector.ListReturnListener, DatabaseConnector.IntegerReturnListener, View.OnClickListener, DatabaseConnector.OnPostExecuteListener { private static final int HEADER_PADDING_TOP = 15; private static final int HEADER_PADDING_BOTTOM = 15; private static final int HEADER_PADDING_LEFT = 15; @@ -75,8 +75,8 @@ public class EntriesFragment extends Fragment implements AsyncDatabaseConnector. initListeners(); onPostExecuteListenerExecuted = 0; - Static.asyncDatabaseConnector.getFields(tableName); - Static.asyncDatabaseConnector.getEntriesCount(tableName); + Static.databaseConnector.getFields(tableName); + Static.databaseConnector.getEntriesCount(tableName); return rootView; } @@ -112,10 +112,10 @@ public class EntriesFragment extends Fragment implements AsyncDatabaseConnector. } private void initListeners(){ - Static.asyncDatabaseConnector.setIntegerReturnListener(this); - Static.asyncDatabaseConnector.setListReturnListener(this); - Static.asyncDatabaseConnector.setMatrixReturnListener(this); - Static.asyncDatabaseConnector.setOnPostExecuteListener(this); + Static.databaseConnector.setIntegerReturnListener(this); + Static.databaseConnector.setListReturnListener(this); + Static.databaseConnector.setMatrixReturnListener(this); + Static.databaseConnector.setOnPostExecuteListener(this); } @Override @@ -157,7 +157,7 @@ public class EntriesFragment extends Fragment implements AsyncDatabaseConnector. onPostExecuteListenerExecuted--; setLoading(true); - Static.asyncDatabaseConnector.getRows(tableName, entriesLimit, page); // get new entries + Static.databaseConnector.getRows(tableName, entriesLimit, page); // get new entries } private void addNewElement(){ @@ -240,7 +240,7 @@ public class EntriesFragment extends Fragment implements AsyncDatabaseConnector. headerRow.addView(textView); } - Static.asyncDatabaseConnector.getRows(tableName, entriesLimit, page); + Static.databaseConnector.getRows(tableName, entriesLimit, page); } @Override diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/LoginFragment.java b/app/src/main/java/info/nerull7/mysqlbrowser/LoginFragment.java index d0a1eee..324c7e4 100644 --- a/app/src/main/java/info/nerull7/mysqlbrowser/LoginFragment.java +++ b/app/src/main/java/info/nerull7/mysqlbrowser/LoginFragment.java @@ -12,21 +12,21 @@ import android.widget.Button; import android.widget.EditText; import android.widget.ProgressBar; -import info.nerull7.mysqlbrowser.db.AsyncDatabaseConnector; +import info.nerull7.mysqlbrowser.db.DatabaseConnector; /** * Created by nerull7 on 07.07.14. * * Fragment for login */ -public class LoginFragment extends Fragment implements View.OnClickListener, AsyncDatabaseConnector.BooleanReturnListener, AsyncDatabaseConnector.OnPostExecuteListener { +public class LoginFragment extends Fragment implements View.OnClickListener, DatabaseConnector.BooleanReturnListener, DatabaseConnector.OnPostExecuteListener { private EditText urlTextbox; private EditText loginTextbox; private EditText passwordTextbox; private ProgressBar progressBar; private Button loginButton; - AsyncDatabaseConnector asyncDatabaseConnector; + DatabaseConnector databaseConnector; private boolean result; @@ -86,10 +86,10 @@ public class LoginFragment extends Fragment implements View.OnClickListener, Asy url = urlTextbox.getText().toString(); if(Static.isNetworkConnected(getActivity())) { - asyncDatabaseConnector = new AsyncDatabaseConnector(login, password, url, getActivity().getResources()); - asyncDatabaseConnector.setBooleanReturnListener(this); - asyncDatabaseConnector.setOnPostExecuteListener(this); - asyncDatabaseConnector.checkLogin(); + databaseConnector = new DatabaseConnector(login, password, url, getActivity().getResources()); + databaseConnector.setBooleanReturnListener(this); + databaseConnector.setOnPostExecuteListener(this); + databaseConnector.checkLogin(); } else { Static.showErrorAlert(getResources().getString(R.string.no_connection), getActivity()); loginButton.setEnabled(true); // Now we can click button again @@ -106,13 +106,13 @@ public class LoginFragment extends Fragment implements View.OnClickListener, Asy @Override public void onPostExecute() { if(result) { - Static.asyncDatabaseConnector = asyncDatabaseConnector; + Static.databaseConnector = databaseConnector; Intent intent = new Intent(getActivity(), ListActivity.class); intent.putExtra(Static.FRAGMENT_TO_START, Static.FRAGMENT_DATABASE); startActivity(intent); } else { - Static.showErrorAlert(AsyncDatabaseConnector.errorMsg, getActivity()); + Static.showErrorAlert(DatabaseConnector.errorMsg, getActivity()); } loginButton.setEnabled(true); // Now we can click button again diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/SQLEntriesFragment.java b/app/src/main/java/info/nerull7/mysqlbrowser/SQLEntriesFragment.java index 4c1af95..610a66a 100644 --- a/app/src/main/java/info/nerull7/mysqlbrowser/SQLEntriesFragment.java +++ b/app/src/main/java/info/nerull7/mysqlbrowser/SQLEntriesFragment.java @@ -3,14 +3,10 @@ package info.nerull7.mysqlbrowser; import android.app.AlertDialog; import android.app.Fragment; import android.content.DialogInterface; -import android.content.Intent; import android.graphics.Typeface; import android.os.Bundle; -import android.preference.PreferenceManager; import android.view.LayoutInflater; import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; @@ -23,17 +19,16 @@ import android.widget.TableLayout; import android.widget.TableRow; import android.widget.TextView; -import java.util.ArrayList; import java.util.List; -import info.nerull7.mysqlbrowser.db.AsyncDatabaseConnector; +import info.nerull7.mysqlbrowser.db.DatabaseConnector; /** * Created by nerull7 on 15.07.14. * * Fragment for showing elements */ -public class SQLEntriesFragment extends Fragment implements AsyncDatabaseConnector.MatrixReturnListener, AsyncDatabaseConnector.ListReturnListener, AsyncDatabaseConnector.OnPostExecuteListener, AsyncDatabaseConnector.StringReturnListener { +public class SQLEntriesFragment extends Fragment implements DatabaseConnector.MatrixReturnListener, DatabaseConnector.ListReturnListener, DatabaseConnector.OnPostExecuteListener, DatabaseConnector.StringReturnListener { private static final int HEADER_PADDING_TOP = 15; private static final int HEADER_PADDING_BOTTOM = 15; private static final int HEADER_PADDING_LEFT = 15; diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/SQLFragment.java b/app/src/main/java/info/nerull7/mysqlbrowser/SQLFragment.java index c67bc2e..0249a12 100644 --- a/app/src/main/java/info/nerull7/mysqlbrowser/SQLFragment.java +++ b/app/src/main/java/info/nerull7/mysqlbrowser/SQLFragment.java @@ -1,6 +1,5 @@ package info.nerull7.mysqlbrowser; -import android.app.Activity; import android.app.Fragment; import android.app.FragmentTransaction; import android.content.Context; @@ -15,12 +14,12 @@ import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; -import info.nerull7.mysqlbrowser.db.AsyncDatabaseConnector; +import info.nerull7.mysqlbrowser.db.DatabaseConnector; /** * Created by nerull7 on 30.09.14. */ -public class SQLFragment extends Fragment implements AsyncDatabaseConnector.OnPostExecuteListener { +public class SQLFragment extends Fragment implements DatabaseConnector.OnPostExecuteListener { private EditText sqlEditText; private InputMethodManager inputMethodManager; private SQLEntriesFragment sqlEntriesFragment; @@ -76,11 +75,11 @@ public class SQLFragment extends Fragment implements AsyncDatabaseConnector.OnPo fragmentTransaction.replace(R.id.container, sqlEntriesFragment); fragmentTransaction.commit(); - Static.asyncDatabaseConnector.setStringReturnListener(sqlEntriesFragment); - Static.asyncDatabaseConnector.setListReturnListener(sqlEntriesFragment); - Static.asyncDatabaseConnector.setMatrixReturnListener(sqlEntriesFragment); - Static.asyncDatabaseConnector.setOnPostExecuteListener(this); - Static.asyncDatabaseConnector.executeSQL(getActivity().getIntent().getExtras().getString(Static.DATABASE_NAME_ARG), sqlQuery); + Static.databaseConnector.setStringReturnListener(sqlEntriesFragment); + Static.databaseConnector.setListReturnListener(sqlEntriesFragment); + Static.databaseConnector.setMatrixReturnListener(sqlEntriesFragment); + Static.databaseConnector.setOnPostExecuteListener(this); + Static.databaseConnector.executeSQL(getActivity().getIntent().getExtras().getString(Static.DATABASE_NAME_ARG), sqlQuery); } @Override diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/Static.java b/app/src/main/java/info/nerull7/mysqlbrowser/Static.java index ca0281e..abf0d41 100644 --- a/app/src/main/java/info/nerull7/mysqlbrowser/Static.java +++ b/app/src/main/java/info/nerull7/mysqlbrowser/Static.java @@ -7,7 +7,7 @@ import android.content.Intent; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import info.nerull7.mysqlbrowser.db.AsyncDatabaseConnector; +import info.nerull7.mysqlbrowser.db.DatabaseConnector; /** * Created by nerull7 on 14.07.14. @@ -20,7 +20,7 @@ public class Static { public static final String FRAGMENT_DATABASE = "DatabaseFragment"; public static final String FRAGMENT_TABLE = "TableFragment"; - public static AsyncDatabaseConnector asyncDatabaseConnector = null; + public static DatabaseConnector databaseConnector = null; public static void startSettings(Context context){ Intent intent = new Intent(context, SettingsActivity.class); diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/TableFragment.java b/app/src/main/java/info/nerull7/mysqlbrowser/TableFragment.java index 1007f2c..25dbedc 100644 --- a/app/src/main/java/info/nerull7/mysqlbrowser/TableFragment.java +++ b/app/src/main/java/info/nerull7/mysqlbrowser/TableFragment.java @@ -17,12 +17,12 @@ import android.widget.TextView; import java.util.List; -import info.nerull7.mysqlbrowser.db.AsyncDatabaseConnector; +import info.nerull7.mysqlbrowser.db.DatabaseConnector; /** * Created by nerull7 on 14.07.14. */ -public class TableFragment extends Fragment implements AdapterView.OnItemClickListener, AsyncDatabaseConnector.ListReturnListener, AsyncDatabaseConnector.OnPostExecuteListener { +public class TableFragment extends Fragment implements AdapterView.OnItemClickListener, DatabaseConnector.ListReturnListener, DatabaseConnector.OnPostExecuteListener { private String databaseName; private ListView tablesList; private ListAdapter listAdapter; @@ -38,9 +38,9 @@ public class TableFragment extends Fragment implements AdapterView.OnItemClickLi tablesList = (ListView) rootView.findViewById(R.id.tableList); this.rootView = (RelativeLayout) rootView; progressBar = (ProgressBar) rootView.findViewById(R.id.loginProgressBar); - Static.asyncDatabaseConnector.setListReturnListener(this); - Static.asyncDatabaseConnector.setOnPostExecuteListener(this); - Static.asyncDatabaseConnector.getTables(); + Static.databaseConnector.setListReturnListener(this); + Static.databaseConnector.setOnPostExecuteListener(this); + Static.databaseConnector.getTables(); return rootView; } diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/db/AsyncDatabaseConnector.java b/app/src/main/java/info/nerull7/mysqlbrowser/db/DatabaseConnector.java similarity index 98% rename from app/src/main/java/info/nerull7/mysqlbrowser/db/AsyncDatabaseConnector.java rename to app/src/main/java/info/nerull7/mysqlbrowser/db/DatabaseConnector.java index 0162ca8..c4f98ad 100644 --- a/app/src/main/java/info/nerull7/mysqlbrowser/db/AsyncDatabaseConnector.java +++ b/app/src/main/java/info/nerull7/mysqlbrowser/db/DatabaseConnector.java @@ -28,7 +28,7 @@ import info.nerull7.mysqlbrowser.R; * Created by nerull7 on 07.07.14. * Database connector using Async calls */ -public class AsyncDatabaseConnector { +public class DatabaseConnector { public static final String ACTION_LOGIN = "login"; public static final String ACTION_DATABASE_LIST = "dblist"; public static final String ACTION_TABLE_LIST = "tablelist"; @@ -57,7 +57,7 @@ public class AsyncDatabaseConnector { public static String errorMsg; private OnPostExecuteListener onPostExecuteListener; - public AsyncDatabaseConnector(String login, String password, String url, Resources resources){ + public DatabaseConnector(String login, String password, String url, Resources resources){ this.login = login; this.password = password; this.url = url; @@ -443,10 +443,10 @@ public class AsyncDatabaseConnector { private Resources resources; public static final String CONNECTION_REQUEST_METHOD = "POST"; - public static final int CONNECTION_TIMEOUT = 15000; - public static final int READ_TIMEOUT = 10000; + public static final int CONNECTION_TIMEOUT = 15000; // ms + public static final int READ_TIMEOUT = 10000; // ms - Downloader(OnFinishedListener onFinishedListener, OnPostExecuteListener onPostExecuteListener, Resources resources){ + private Downloader(OnFinishedListener onFinishedListener, OnPostExecuteListener onPostExecuteListener, Resources resources){ this.onFinishedListener = onFinishedListener; this.onPostExecuteListener = onPostExecuteListener; this.resources = resources;