Fixed critical Bugs in Ugly DBHELPER

QS: code quality check in logfilter object

src/de/tudarmstadt/informatik/hostage/logging/UglyDbHelper.java

@@ -36,9 +36,9 @@ public class UglyDbHelper extends SQLiteOpenHelper {
 	private static final String DATABASE_NAME = "recordManager";
 
 	// Contacts table names
-	public static final String TABLE_ATTACK_INFO = "attack_info";
-    public static final String TABLE_RECORDS = "records";
-    public static final String TABLE_BSSIDS = "bssids";
+	private static final String TABLE_ATTACK_INFO = "attack_info";
+    private static final String TABLE_RECORDS = "records";
+    private static final String TABLE_BSSIDS = "bssids";
 
 	// Contacts Table Columns names
 	public static final String KEY_ID = "_id";
@@ -140,15 +140,15 @@ public class UglyDbHelper extends SQLiteOpenHelper {
 
 		if (filter.getBSSIDs() != null && filter.getBSSIDs().size() > 0) {
 			selectQuery = selectQuery + " AND ";
-			selectQuery = selectQuery + filter.getBSSIDQueryStatement(KEY_BSSID);
+			selectQuery = selectQuery + filter.getBSSIDQueryStatement(TABLE_BSSIDS, KEY_BSSID);
 		}
 		if (filter.getESSIDs() != null && filter.getESSIDs().size() > 0) {
 			selectQuery = selectQuery + " AND ";
-			selectQuery = selectQuery + filter.getESSIDQueryStatement(KEY_SSID);
+			selectQuery = selectQuery + filter.getESSIDQueryStatement(TABLE_BSSIDS, KEY_SSID);
 		}
 		if (filter.getProtocols() != null && filter.getProtocols().size() > 0) {
 			selectQuery = selectQuery + " AND ";
-			selectQuery = selectQuery + filter.getProtocolsQueryStatement(KEY_PROTOCOL);
+			selectQuery = selectQuery + filter.getProtocolsQueryStatement(TABLE_ATTACK_INFO, KEY_PROTOCOL);
 		}
 
 
@@ -298,8 +298,8 @@ public class UglyDbHelper extends SQLiteOpenHelper {
 	 */
 	public boolean bssidSeen(String protocol, String BSSID) {
 		String countQuery = "SELECT  * FROM " + TABLE_ATTACK_INFO
-				+ " JOIN " + TABLE_BSSIDS + " USING " + "(" + KEY_BSSID + ")" + " WHERE " + KEY_PROTOCOL
-				+ " = " + "'" + protocol + "'" + " AND " + KEY_BSSID + " = "
+				+ " JOIN " + TABLE_BSSIDS + " USING " + "(" + KEY_BSSID + ")" + " WHERE " + TABLE_ATTACK_INFO + "." +  KEY_PROTOCOL
+				+ " = " + "'" + protocol + "'" + " AND " + TABLE_BSSIDS+ "."+ KEY_BSSID + " = "
 				+ "'" + BSSID + "'";
 		SQLiteDatabase db = this.getReadableDatabase();
 		Cursor cursor = db.rawQuery(countQuery, null);
@@ -385,7 +385,7 @@ public class UglyDbHelper extends SQLiteOpenHelper {
 		String selectQuery = "SELECT  * FROM " + TABLE_RECORDS
 				+ " NATURAL JOIN " + TABLE_ATTACK_INFO + " JOIN "
 				+ TABLE_BSSIDS + " USING " + "(" + KEY_BSSID + ")" + " WHERE " + KEY_TYPE + "='RECEIVE'"
-				+ " ORDER BY " + KEY_TIME;
+				+ " ORDER BY " + TABLE_RECORDS+ "."+ KEY_TIME;
 		SQLiteDatabase db = this.getReadableDatabase();
 		Cursor cursor = db.rawQuery(selectQuery, null);
 
@@ -535,7 +535,7 @@ public class UglyDbHelper extends SQLiteOpenHelper {
 	public Record getRecord(int id) {
 		String selectQuery = "SELECT  * FROM " + TABLE_RECORDS
 				+ " NATURAL JOIN " + TABLE_ATTACK_INFO + " JOIN "
-				+ TABLE_BSSIDS + " USING " + "(" + KEY_BSSID + ")" + " WHERE " + KEY_ID + " = " + id;
+				+ TABLE_BSSIDS + " USING " + "(" + KEY_BSSID + ")" + " WHERE " + TABLE_RECORDS+"."+KEY_ID + " = " + id;
 		SQLiteDatabase db = this.getReadableDatabase();
 
 		Cursor cursor = db.rawQuery(selectQuery, null);
@@ -577,8 +577,8 @@ public class UglyDbHelper extends SQLiteOpenHelper {
 	public Record getRecordOfAttackId(long attack_id) {
 		String selectQuery = "SELECT  * FROM " + TABLE_RECORDS
 				+ " NATURAL JOIN " + TABLE_ATTACK_INFO + " JOIN "
-				+ TABLE_BSSIDS + " USING " + "(" + KEY_BSSID + ")" + " WHERE " + KEY_ATTACK_ID + " = " + attack_id
-				+ " GROUP BY " + KEY_ATTACK_ID;
+				+ TABLE_BSSIDS + " USING " + "(" + KEY_BSSID + ")" + " WHERE " + TABLE_RECORDS+"."+KEY_ATTACK_ID + " = " + attack_id
+				+ " GROUP BY " + TABLE_RECORDS+"."+KEY_ATTACK_ID;
 		SQLiteDatabase db = this.getReadableDatabase();
 		Cursor cursor = db.rawQuery(selectQuery, null);
 		Record record = null;
@@ -604,7 +604,7 @@ public class UglyDbHelper extends SQLiteOpenHelper {
 		ArrayList<Record> recordList = new ArrayList<Record>();
 		String selectQuery = "SELECT  * FROM " + TABLE_RECORDS
 				+ " NATURAL JOIN " + TABLE_ATTACK_INFO + " JOIN "
-				+ TABLE_BSSIDS  + " USING " + "(" + KEY_BSSID + ")" + " GROUP BY " + KEY_ATTACK_ID;
+				+ TABLE_BSSIDS  + " USING " + "(" + KEY_BSSID + ")" + " GROUP BY " + TABLE_RECORDS+ "."+KEY_ATTACK_ID;
 		SQLiteDatabase db = this.getReadableDatabase();
 		Cursor cursor = db.rawQuery(selectQuery, null);
 
@@ -636,8 +636,8 @@ public class UglyDbHelper extends SQLiteOpenHelper {
 		ArrayList<Record> recordList = new ArrayList<Record>();
 		String selectQuery = "SELECT  * FROM " + TABLE_RECORDS
 				+ " NATURAL JOIN " + TABLE_ATTACK_INFO + " JOIN "
-				+ TABLE_BSSIDS + " USING " + "(" + KEY_BSSID + ")" + " WHERE " + KEY_ATTACK_ID + " > " + attack_id
-				+ " GROUP BY " + KEY_ATTACK_ID;
+				+ TABLE_BSSIDS + " USING " + "(" + KEY_BSSID + ")" + " WHERE " + TABLE_RECORDS+"."+KEY_ATTACK_ID + " > " + attack_id
+				+ " GROUP BY " + TABLE_RECORDS+"."+KEY_ATTACK_ID;
 		SQLiteDatabase db = this.getReadableDatabase();
 		Cursor cursor = db.rawQuery(selectQuery, null);
 

src/de/tudarmstadt/informatik/hostage/ui/LogFilter.java

@@ -6,8 +6,6 @@ import android.os.Parcelable;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import de.tudarmstadt.informatik.hostage.logging.UglyDbHelper;
-
 
 public class LogFilter implements Parcelable{
 	
@@ -172,14 +170,14 @@ public class LogFilter implements Parcelable{
 	}
 	
 	
-	public String getBSSIDQueryStatement(String key){
-		return this.convertArrayListToQueryString(this.BSSIDs, UglyDbHelper.TABLE_BSSIDS, key);
+	public String getBSSIDQueryStatement(String tablename, String key){
+		return this.convertArrayListToQueryString(this.BSSIDs, tablename, key);
 	}
-	public String getESSIDQueryStatement(String key){
-		return this.convertArrayListToQueryString(this.ESSIDs, UglyDbHelper.TABLE_BSSIDS ,key);
+	public String getESSIDQueryStatement(String tablename, String key){
+		return this.convertArrayListToQueryString(this.ESSIDs,tablename ,key);
 	}
-	public String getProtocolsQueryStatement(String key){
-		return this.convertArrayListToQueryString(this.protocols,UglyDbHelper.TABLE_ATTACK_INFO, key);
+	public String getProtocolsQueryStatement(String tablename, String key){
+		return this.convertArrayListToQueryString(this.protocols,tablename, key);
 	}
 
     public boolean isSet(){

src/de/tudarmstadt/informatik/hostage/ui2/fragment/RecordOverviewFragment.java

@@ -593,10 +593,10 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
 	
 	
 	/*****************************
-	 * 
-	 *          TEST 
-	 * 
-	 * ***************************/
+     *
+     *          TEST
+     *
+     * ***************************/
 	
 	private void addRecordToDB() {