Regex matching for export settings

LogFile View format changed

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

@@ -171,6 +171,8 @@ public class Record implements Serializable {
 			case 1: 
 				return String.format("{ \"src\":{\"IP\": %s, \"Port\": %d} \"dst\": {\"IP\": %s, \"Port\": %d} \"type\": 0 \"name\": \"HOsTaGe\" }", localIP.getHostAddress(), localPort, remoteIP.getHostAddress(),
 					remotePort);
+			case 2: 
+				return String.format("%d: %s in %s(%s) from [%s:%d] to [%s:%d]", attack_id, protocol, SSID, BSSID, remoteIP.getHostAddress(), remotePort, localIP.getHostAddress(), localPort);
 			default:
 				return toString();
 		}

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

@@ -30,7 +30,7 @@ import android.widget.Toast;
 public class SQLLogger implements Logger{
 	Context context;
 	DatabaseHandler dbh;
-	public static final int JSON = 0x02;
+	public static final int JSON = 0x01;
 	private int progressMax;
 	private int lastUploadedAttackId;
 	private NotificationCompat.Builder builder;
@@ -77,7 +77,7 @@ public class SQLLogger implements Logger{
 			}
 			log.flush();
 			log.close();
-			Toast.makeText(context, externalStorage ? filename + " saved on external memory! " + externalLocation : filename + " saved on internal memory!", Toast.LENGTH_SHORT).show();
+			Toast.makeText(context, externalStorage ? filename + " saved on external memory! " + externalLocation : filename + " saved on internal memory!", Toast.LENGTH_LONG).show();
 		} catch (Exception e) {
 			Toast.makeText(context, "Could not write to SD Card", Toast.LENGTH_SHORT).show();
 			e.printStackTrace();

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

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
+import android.widget.Toast;
 
 public class SettingsActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener {
     @Override
@@ -36,10 +37,25 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref
 
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
             String key) {
-    	if(key.equals("pref_external_location") || key.equals("pref_upload_server")){
+    	if(key.equals("pref_external_location")){
+            Preference pref = findPreference(key);
+            EditTextPreference etp = (EditTextPreference) pref;
+            String path = etp.getText();
+            if(!path.startsWith("/"))
+            	path = new String("/").concat(path);
+            if(!path.endsWith("/"))
+            	path = path.concat(new String("/"));
+            if (!path.matches("/(([a-zA-Z_0-9])+/)*")){
+            	Toast.makeText(getApplicationContext(), "Path not valid. Must only contain a-zA-Z_0-9", Toast.LENGTH_SHORT).show();
+            	path = "/";
+            }
+            pref.setSummary(path);
+        }
+    	else if(key.equals("pref_upload_server")){
             Preference pref = findPreference(key);
             EditTextPreference etp = (EditTextPreference) pref;
             pref.setSummary(etp.getText());
         }
+    	 
     }
 }

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

@@ -12,11 +12,11 @@ public class ViewLogTable extends Activity{
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		DatabaseHandler db = new DatabaseHandler(getBaseContext());
+		DatabaseHandler dbh = new DatabaseHandler(getBaseContext());
 		String log = "";
-		for(Record record: db.getAllRecords())
+		for(Record record: dbh.getRecordOfEachAttack())
 		{
-			log = log + record.toString() + "\n";
+			log = log + record.toString(2) + "\n";
 		}
 		
 		ScrollView scroll = new ScrollView(this);