Browse Source

code clean-up

mip-it 10 years ago
parent
commit
a599b0974c

+ 1 - 1
src/de/tudarmstadt/informatik/hostage/HoneyListener.java

@@ -72,7 +72,7 @@ public class HoneyListener implements Runnable {
 				// server = new MyServerSocketFactory().createServerSocket(
 				// protocol.getPort(), ((SSLProtocol)
 				// protocol).getSSLContext());
-				server = (SSLServerSocket) ((SSLProtocol) protocol)
+				server = ((SSLProtocol) protocol)
 						.getSSLContext().getServerSocketFactory()
 						.createServerSocket(protocol.getPort());
 			else

+ 0 - 5
src/de/tudarmstadt/informatik/hostage/HoneyService.java

@@ -3,7 +3,6 @@ package de.tudarmstadt.informatik.hostage;
 import java.util.ArrayList;
 import java.util.List;
 
-import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -14,17 +13,13 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.net.Uri;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
 import android.os.Binder;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.TaskStackBuilder;
 import android.support.v4.content.LocalBroadcastManager;
-import android.util.Log;
 import android.widget.Toast;
 import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
 import de.tudarmstadt.informatik.hostage.logging.DatabaseHandler;

+ 0 - 9
src/de/tudarmstadt/informatik/hostage/commons/HelperUtils.java

@@ -5,11 +5,8 @@ import java.net.UnknownHostException;
 import java.security.KeyStore;
 import java.util.concurrent.ExecutionException;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
 import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
 import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.conn.scheme.PlainSocketFactory;
 import org.apache.http.conn.scheme.Scheme;
@@ -21,10 +18,6 @@ import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.HTTP;
-import org.apache.http.util.EntityUtils;
-import org.json.JSONObject;
-
-import de.tudarmstadt.informatik.hostage.R;
 import de.tudarmstadt.informatik.hostage.net.MySSLSocketFactory;
 import de.tudarmstadt.informatik.hostage.ui.MainActivity;
 import android.content.Context;
@@ -36,8 +29,6 @@ import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Environment;
 import android.text.TextUtils;
-import android.util.Log;
-import android.widget.TextView;
 
 public final class HelperUtils {
 

+ 0 - 3
src/de/tudarmstadt/informatik/hostage/handler/AbstractHandler.java

@@ -5,7 +5,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
 
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.preference.PreferenceManager;
@@ -15,9 +14,7 @@ import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
 import de.tudarmstadt.informatik.hostage.logging.Logger;
 import de.tudarmstadt.informatik.hostage.logging.Record;
 import de.tudarmstadt.informatik.hostage.logging.Record.TYPE;
-import de.tudarmstadt.informatik.hostage.logging.SQLLogger;
 import de.tudarmstadt.informatik.hostage.protocol.Protocol;
-import de.tudarmstadt.informatik.hostage.ui.MainActivity;
 
 public abstract class AbstractHandler implements Runnable {
 

+ 0 - 2
src/de/tudarmstadt/informatik/hostage/logging/DatabaseHandler.java

@@ -3,8 +3,6 @@ package de.tudarmstadt.informatik.hostage.logging;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
-import java.util.List;
-
 import de.tudarmstadt.informatik.hostage.logging.Record.TYPE;
 import android.content.ContentValues;
 import android.content.Context;

+ 0 - 2
src/de/tudarmstadt/informatik/hostage/logging/Record.java

@@ -3,8 +3,6 @@ package de.tudarmstadt.informatik.hostage.logging;
 import java.io.Serializable;
 import java.net.InetAddress;
 
-import de.tudarmstadt.informatik.hostage.protocol.Protocol;
-
 public class Record implements Serializable {
 
 	private static final long serialVersionUID = 1L;

+ 4 - 5
src/de/tudarmstadt/informatik/hostage/logging/SQLLogger.java

@@ -2,12 +2,9 @@ package de.tudarmstadt.informatik.hostage.logging;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 
 import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
@@ -15,7 +12,6 @@ import org.apache.http.entity.StringEntity;
 import de.tudarmstadt.informatik.hostage.R;
 import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
 import de.tudarmstadt.informatik.hostage.ui.MainActivity;
-import de.tudarmstadt.informatik.hostage.ui.ViewLog;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -46,6 +42,7 @@ public class SQLLogger implements Logger{
 		editor = pref.edit();
 	}
 
+	@Override
 	public synchronized void write(Record record) {
 		dbh.addRecord(record);
 	}
@@ -111,7 +108,8 @@ public class SQLLogger implements Logger{
 		mNotifyManager.notify(2, builder.build());
 		new Thread(new Runnable() {
 
-			  public void run() {				  
+			  @Override
+			public void run() {				  
 					HttpClient httpclient = HelperUtils.createHttpClient();
 					ArrayList<Record> recordList = dbh.getRecordOfEachAttack(lastUploadedAttackId);
 					progressMax = recordList.size();		
@@ -150,6 +148,7 @@ public class SQLLogger implements Logger{
 		editor.commit();				
 	}
 	
+	@Override
 	public int getAttackCount(){
 		return dbh.getAttackCount();
 	}

+ 3 - 0
src/de/tudarmstadt/informatik/hostage/net/MySSLSocketFactory.java

@@ -26,14 +26,17 @@ public class MySSLSocketFactory extends SSLSocketFactory {
 		super(truststore);
 
 		TrustManager tm = new X509TrustManager() {
+			@Override
 			public void checkClientTrusted(X509Certificate[] chain,
 					String authType) throws CertificateException {
 			}
 
+			@Override
 			public void checkServerTrusted(X509Certificate[] chain,
 					String authType) throws CertificateException {
 			}
 
+			@Override
 			public X509Certificate[] getAcceptedIssuers() {
 				return null;
 			}

+ 1 - 1
src/de/tudarmstadt/informatik/hostage/protocol/SSH.java

@@ -377,7 +377,7 @@ public final class SSH implements Protocol<ByteArray> {
 		  int ret = 0;
 		  for (int i=0; i < bytes.length; i++) {
 		    ret <<= 8;
-		    ret |= (int)bytes[i] & 0xFF;
+		    ret |= bytes[i] & 0xFF;
 		  }
 		  return ret;
 	}

+ 1 - 2
src/de/tudarmstadt/informatik/hostage/ui/MainActivity.java

@@ -18,7 +18,6 @@ import android.net.ConnectivityManager;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.support.v4.content.LocalBroadcastManager;
-import android.util.Log;
 import android.view.GestureDetector;
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.Menu;
@@ -456,7 +455,7 @@ public class MainActivity extends Activity {
 	}
 
 
-	/*############# AB HIER KOMMEN HILFSFUNKTIONEN FÜR GESTEN ##################*/
+	/*############# AB HIER KOMMEN HILFSFUNKTIONEN F�R GESTEN ##################*/
 	
 	@Override
 	public boolean onTouchEvent(MotionEvent event) {

+ 6 - 3
src/de/tudarmstadt/informatik/hostage/ui/SettingsActivity.java

@@ -23,19 +23,22 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref
         pref.setSummary(etp.getText());
     }    
 
-    protected void onResume() {
+    @Override
+	protected void onResume() {
         super.onResume();
         getPreferenceScreen().getSharedPreferences()
                 .registerOnSharedPreferenceChangeListener(this);
     }
 
-    protected void onPause() {
+    @Override
+	protected void onPause() {
         super.onPause();
         getPreferenceScreen().getSharedPreferences()
                 .unregisterOnSharedPreferenceChangeListener(this);
     }
 
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+    @Override
+	public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
             String key) {
     	if(key.equals("pref_external_location")){
             Preference pref = findPreference(key);

+ 8 - 5
src/de/tudarmstadt/informatik/hostage/ui/ViewLog.java

@@ -5,8 +5,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.HashMap;
-
 import de.tudarmstadt.informatik.hostage.R;
 import de.tudarmstadt.informatik.hostage.logging.DatabaseHandler;
 import de.tudarmstadt.informatik.hostage.logging.Record;
@@ -24,14 +22,11 @@ import android.content.SharedPreferences.Editor;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.FragmentTransaction;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.DatePicker;
-import android.widget.LinearLayout;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
@@ -77,6 +72,7 @@ public class ViewLog extends Activity {
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
 		builder.setTitle(R.string.export_dialog_title);
 		builder.setItems(R.array.format, new DialogInterface.OnClickListener() {
+			@Override
 			public void onClick(DialogInterface dialog, int position) {
 				SQLLogger logger = new SQLLogger(context);
 				logger.exportDatabase(position);
@@ -102,6 +98,7 @@ public class ViewLog extends Activity {
 		builder.setTitle(R.string.delete_dialog_title);
 		builder.setItems(R.array.delete_criteria,
 				new DialogInterface.OnClickListener() {
+					@Override
 					public void onClick(DialogInterface dialog, int position) {
 						switch (position) {
 						case 0:
@@ -125,6 +122,7 @@ public class ViewLog extends Activity {
 
 	private DatePickerDialog.OnDateSetListener pDateSetListener = new DatePickerDialog.OnDateSetListener() {
 
+		@Override
 		public void onDateSet(DatePicker view, int year, int monthOfYear,
 				int dayOfMonth) {
 			deleteByDate(year, monthOfYear, dayOfMonth);
@@ -155,6 +153,7 @@ public class ViewLog extends Activity {
 				.setMessage(sdf.format(calendar.getTime()))
 				.setPositiveButton(R.string.delete,
 						new DialogInterface.OnClickListener() {
+							@Override
 							@SuppressLint("NewApi")
 							public void onClick(DialogInterface dialog, int id) {
 								long time = calendar.getTimeInMillis();
@@ -175,6 +174,7 @@ public class ViewLog extends Activity {
 						})
 				.setNegativeButton(R.string.cancel,
 						new DialogInterface.OnClickListener() {
+							@Override
 							public void onClick(DialogInterface dialog, int id) {
 								// User cancelled the dialog
 							}
@@ -192,6 +192,7 @@ public class ViewLog extends Activity {
 		}
 		builder.setTitle(R.string.delete_dialog_title);
 		builder.setItems(bssidArray, new DialogInterface.OnClickListener() {
+			@Override
 			@SuppressLint("NewApi")
 			public void onClick(DialogInterface dialog, int position) {
 				dbh.deleteByBSSID(bssidArray[position]);
@@ -217,6 +218,7 @@ public class ViewLog extends Activity {
 		builder.setMessage(R.string.dialog_clear_database)
 				.setPositiveButton(R.string.clear,
 						new DialogInterface.OnClickListener() {
+							@Override
 							@SuppressLint("NewApi")
 							public void onClick(DialogInterface dialog, int id) {
 								// Clear all Data
@@ -241,6 +243,7 @@ public class ViewLog extends Activity {
 						})
 				.setNegativeButton(R.string.cancel,
 						new DialogInterface.OnClickListener() {
+							@Override
 							public void onClick(DialogInterface dialog, int id) {
 								// User cancelled the dialog
 							}