Browse Source

more meaningful name for attack count method

Fabio Arnold 9 years ago
parent
commit
0e2f5fe34e

+ 2 - 2
src/de/tudarmstadt/informatik/hostage/persistence/HostageDBOpenHelper.java

@@ -538,7 +538,7 @@ public class HostageDBOpenHelper extends SQLiteOpenHelper {
 		return result > 0;
 	}
 	
-	public synchronized int numBssidSeen(String BSSID) {
+	public synchronized int getNumAttacksSeenByBSSID(String BSSID) {
 		String countQuery = "SELECT  COUNT(*) FROM " + AttackEntry.TABLE_NAME + " WHERE "
 				+ AttackEntry.TABLE_NAME + "." + AttackEntry.COLUMN_NAME_BSSID + " = " + "'" + BSSID + "'";
 		SQLiteDatabase db = this.getReadableDatabase();
@@ -550,7 +550,7 @@ public class HostageDBOpenHelper extends SQLiteOpenHelper {
 		return result;
 	}
 
-    synchronized public int numBssidSeen(String protocol, String BSSID) {
+    synchronized public int getNumAttacksSeenByBSSID(String protocol, String BSSID) {
 		String countQuery = "SELECT  COUNT(*) FROM " + AttackEntry.TABLE_NAME 
 						+  " WHERE " + AttackEntry.TABLE_NAME + "." + AttackEntry.COLUMN_NAME_PROTOCOL + " = " + "'" + protocol + "'" 
 						+  " AND " + AttackEntry.TABLE_NAME + "." + AttackEntry.COLUMN_NAME_BSSID + " = " + "'" + BSSID + "'";

+ 2 - 3
src/de/tudarmstadt/informatik/hostage/ui/fragment/HomeFragment.java

@@ -17,8 +17,6 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
-import android.text.Html;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -182,7 +180,8 @@ public class HomeFragment extends Fragment {
 		}
 
 		boolean hasActiveListeners = false;
-		int totalAttacks = mDbHelper.numBssidSeen(mConnectionInfo.getString(getString(R.string.connection_info_bssid), null));
+		int totalAttacks = mDbHelper.getNumAttacksSeenByBSSID(
+				mConnectionInfo.getString(getString(R.string.connection_info_bssid), null));
 
 		if (MainActivity.getInstance().getHostageService() != null) {
 			if (MainActivity.getInstance().getHostageService().hasRunningListeners()) {

+ 5 - 3
src/de/tudarmstadt/informatik/hostage/ui/fragment/ServicesFragment.java

@@ -3,7 +3,6 @@ package de.tudarmstadt.informatik.hostage.ui.fragment;
 import java.util.ArrayList;
 
 import android.app.AlertDialog;
-import android.app.Fragment;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -126,7 +125,9 @@ public class ServicesFragment extends TrackerFragment {
                     if (sender.equals(Handler.class.getName()) && values[0].equals(getString(R.string.broadcast_started))) {
                         for (ServicesListItem item : protocolList) {
                             if (item.protocol.equals(values[1])) {
-                                item.attacks = dbh.numBssidSeen(item.protocol, mConnectionInfo.getString(getString(R.string.connection_info_bssid), null));
+                                item.attacks = dbh.getNumAttacksSeenByBSSID(item.protocol,
+                                        mConnectionInfo.getString(
+                                                getString(R.string.connection_info_bssid), null));
                             }
                         }
                     }
@@ -174,7 +175,8 @@ public class ServicesFragment extends TrackerFragment {
         int i = 0;
         for (String protocol : protocols) {
             protocolList.add(new ServicesListItem(protocol));
-            protocolList.get(i).attacks = dbh.numBssidSeen(protocolList.get(i).protocol, mConnectionInfo.getString(getString(R.string.connection_info_bssid), null));
+            protocolList.get(i).attacks = dbh.getNumAttacksSeenByBSSID(protocolList.get(i).protocol,
+                    mConnectionInfo.getString(getString(R.string.connection_info_bssid), null));
             i++;
         }