Browse Source

Began creating the new UI. Can be found in src/.../hostage/ui2. Right now the new UI is being used when starting HosTaGe

alexander.brakowski 11 năm trước cách đây
mục cha
commit
ec3fe755be
36 tập tin đã thay đổi với 367 bổ sung137 xóa
  1. 7 2
      AndroidManifest.xml
  2. BIN
      res/drawable-hdpi/ic_menu_gallery.png
  3. BIN
      res/drawable-hdpi/ic_menu_home.png
  4. BIN
      res/drawable-hdpi/ic_menu_info_details.png
  5. BIN
      res/drawable-hdpi/ic_menu_mapmode.png
  6. BIN
      res/drawable-hdpi/ic_menu_set_as.png
  7. BIN
      res/drawable-hdpi/ic_menu_settings_holo_light.png
  8. BIN
      res/drawable-mdpi/ic_menu_gallery.png
  9. BIN
      res/drawable-mdpi/ic_menu_home.png
  10. BIN
      res/drawable-mdpi/ic_menu_info_details.png
  11. BIN
      res/drawable-mdpi/ic_menu_mapmode.png
  12. BIN
      res/drawable-mdpi/ic_menu_set_as.png
  13. BIN
      res/drawable-mdpi/ic_menu_settings_holo_light.png
  14. BIN
      res/drawable-xhdpi/ic_menu_gallery.png
  15. BIN
      res/drawable-xhdpi/ic_menu_home.png
  16. BIN
      res/drawable-xhdpi/ic_menu_info_details.png
  17. BIN
      res/drawable-xhdpi/ic_menu_mapmode.png
  18. BIN
      res/drawable-xhdpi/ic_menu_set_as.png
  19. BIN
      res/drawable-xhdpi/ic_menu_settings_holo_light.png
  20. BIN
      res/drawable-xxhdpi/ic_menu_gallery.png
  21. BIN
      res/drawable-xxhdpi/ic_menu_home.png
  22. BIN
      res/drawable-xxhdpi/ic_menu_info_details.png
  23. BIN
      res/drawable-xxhdpi/ic_menu_mapmode.png
  24. BIN
      res/drawable-xxhdpi/ic_menu_set_as.png
  25. BIN
      res/drawable-xxhdpi/ic_menu_settings_holo_light.png
  26. 21 0
      res/layout/activity_drawer_main.xml
  27. 29 0
      res/layout/drawer_list_item.xml
  28. 10 1
      res/values/strings.xml
  29. 2 3
      src/de/tudarmstadt/informatik/hostage/logging/DatabaseHandler.java
  30. 81 0
      src/de/tudarmstadt/informatik/hostage/ui2/MainActivity.java
  31. 44 0
      src/de/tudarmstadt/informatik/hostage/ui2/adapter/DrawerListAdapter.java
  32. 18 0
      src/de/tudarmstadt/informatik/hostage/ui2/adapter/DrawerListItem.java
  33. 2 5
      target/generated-sources/r/de/tudarmstadt/informatik/hostage/BuildConfig.java
  34. 104 83
      target/generated-sources/r/de/tudarmstadt/informatik/hostage/R.java
  35. BIN
      target/hostage.jar
  36. 49 43
      target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

+ 7 - 2
AndroidManifest.xml

@@ -5,7 +5,7 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="14"
         android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -22,7 +22,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="de.tudarmstadt.informatik.hostage.ui.MainActivity"
+            android:name="de.tudarmstadt.informatik.hostage.ui2.MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name" >
             <intent-filter>
@@ -31,6 +31,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="de.tudarmstadt.informatik.hostage.ui.MainActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name" >
+        </activity>
         <activity
             android:name="de.tudarmstadt.informatik.hostage.ui.ViewLog"
             android:label="@string/statistics" >

BIN
res/drawable-hdpi/ic_menu_gallery.png


BIN
res/drawable-hdpi/ic_menu_home.png


BIN
res/drawable-hdpi/ic_menu_info_details.png


BIN
res/drawable-hdpi/ic_menu_mapmode.png


BIN
res/drawable-hdpi/ic_menu_set_as.png


BIN
res/drawable-hdpi/ic_menu_settings_holo_light.png


BIN
res/drawable-mdpi/ic_menu_gallery.png


BIN
res/drawable-mdpi/ic_menu_home.png


BIN
res/drawable-mdpi/ic_menu_info_details.png


BIN
res/drawable-mdpi/ic_menu_mapmode.png


BIN
res/drawable-mdpi/ic_menu_set_as.png


BIN
res/drawable-mdpi/ic_menu_settings_holo_light.png


BIN
res/drawable-xhdpi/ic_menu_gallery.png


BIN
res/drawable-xhdpi/ic_menu_home.png


BIN
res/drawable-xhdpi/ic_menu_info_details.png


BIN
res/drawable-xhdpi/ic_menu_mapmode.png


BIN
res/drawable-xhdpi/ic_menu_set_as.png


BIN
res/drawable-xhdpi/ic_menu_settings_holo_light.png


BIN
res/drawable-xxhdpi/ic_menu_gallery.png


BIN
res/drawable-xxhdpi/ic_menu_home.png


BIN
res/drawable-xxhdpi/ic_menu_info_details.png


BIN
res/drawable-xxhdpi/ic_menu_mapmode.png


BIN
res/drawable-xxhdpi/ic_menu_set_as.png


BIN
res/drawable-xxhdpi/ic_menu_settings_holo_light.png


+ 21 - 0
res/layout/activity_drawer_main.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v4.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/content_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <ListView
+        android:id="@+id/left_drawer"
+        android:layout_width="240dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:choiceMode="singleChoice"
+        android:background="?android:attr/colorBackground"/>
+</android.support.v4.widget.DrawerLayout>

+ 29 - 0
res/layout/drawer_list_item.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="5dp"
+    android:baselineAligned="false">
+
+    <ImageView
+        android:id="@+id/drawer_listitem_icon"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:layout_marginLeft="16dp"
+        android:src="@drawable/ic_launcher"
+        android:layout_gravity="center_vertical">
+    </ImageView>
+
+    <TextView
+        android:id="@+id/drawer_listitem_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:gravity="center_vertical"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:textColor="?android:attr/colorForeground"
+        android:minHeight="?android:attr/listPreferredItemHeightSmall"/>
+
+</LinearLayout>

+ 10 - 1
res/values/strings.xml

@@ -32,6 +32,15 @@
     <string name="RecordSSID">SSID</string>
     <string name="RecordTimestamp">timestamp</string>
     <string name="RecordProtocol">protocol</string>
-        
+
+    <string name="drawer_open">Open navigation drawer</string>
+    <string name="drawer_close">Close navigation drawer</string>
+
+    <string name="drawer_overview">Overview</string>
+    <string name="drawer_threat_map">Thread Map</string>
+    <string name="drawer_records">Records</string>
+    <string name="drawer_services">Services</string>
+    <string name="drawer_settings">Settings</string>
+    <string name="drawer_app_info">Application info</string>
 
 </resources>

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

@@ -495,8 +495,7 @@ public class DatabaseHandler extends SQLiteOpenHelper {
     	db.delete(TABLE_ATTACK_INFO, KEY_BSSID + " = ?", new String[]{bssid});
     	db.close();
     }
-    
-  //TODO Delete statement überarbeiten
+
     /**
      * Deletes all records from {@link #TABLE_RECORDS} with a time stamp smaller then the given
      * @param date A Date represented in milliseconds.
@@ -504,7 +503,7 @@ public class DatabaseHandler extends SQLiteOpenHelper {
     public void deleteByDate(long date){
     	SQLiteDatabase db = this.getReadableDatabase();
     	String deleteQuery = "DELETE  FROM " + TABLE_RECORDS + " WHERE " + KEY_TIME + " < " + date;
-    	//TODO Delete statement überarbeiten
+    	//TODO Delete statement �berarbeiten
 //    	String deleteQuery2 = "DELETE "
     	db.execSQL(deleteQuery);
     	db.close();

+ 81 - 0
src/de/tudarmstadt/informatik/hostage/ui2/MainActivity.java

@@ -0,0 +1,81 @@
+package de.tudarmstadt.informatik.hostage.ui2;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.v4.app.ActionBarDrawerToggle;
+import android.support.v4.widget.DrawerLayout;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
+import java.util.ArrayList;
+
+import de.tudarmstadt.informatik.hostage.R;
+import de.tudarmstadt.informatik.hostage.ui2.adapter.DrawerListAdapter;
+import de.tudarmstadt.informatik.hostage.ui2.adapter.DrawerListItem;
+
+/**
+ * @author  Alexander Brakowski
+ * @created 12.01.14 23:24
+ */
+public class MainActivity extends Activity {
+    private DrawerLayout mDrawerLayout;
+    private ListView mDrawerList;
+    private ActionBarDrawerToggle mDrawerToggle;
+
+    private CharSequence mDrawerTitle;
+    private CharSequence mTitle;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_drawer_main);
+
+        mTitle = mDrawerTitle = getTitle();
+        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+        mDrawerList = (ListView) findViewById(R.id.left_drawer);
+
+        ArrayList<DrawerListItem> lst = new ArrayList<DrawerListItem>();
+        lst.add(new DrawerListItem(R.string.drawer_overview, R.drawable.ic_menu_home));
+        lst.add(new DrawerListItem(R.string.drawer_threat_map, R.drawable.ic_menu_mapmode));
+        lst.add(new DrawerListItem(R.string.drawer_records, R.drawable.ic_menu_gallery));
+        lst.add(new DrawerListItem(R.string.drawer_services, R.drawable.ic_menu_set_as));
+        lst.add(new DrawerListItem(R.string.drawer_settings, R.drawable.ic_menu_settings_holo_light));
+        lst.add(new DrawerListItem(R.string.drawer_app_info, R.drawable.ic_menu_info_details));
+
+        DrawerListAdapter listAdapter = new DrawerListAdapter(this, lst);
+
+        mDrawerList.setAdapter(listAdapter);
+        mDrawerList.setOnItemClickListener(new DrawerItemClickListener());
+
+        getActionBar().setDisplayHomeAsUpEnabled(true);
+        getActionBar().setHomeButtonEnabled(true);
+
+        mDrawerToggle = new ActionBarDrawerToggle(
+                this,                  /* host Activity */
+                mDrawerLayout,         /* DrawerLayout object */
+                R.drawable.ic_launcher,  /* nav drawer image to replace 'Up' caret */
+                R.string.drawer_open,  /* "open drawer" description for accessibility */
+                R.string.drawer_close  /* "close drawer" description for accessibility */
+        ) {
+            public void onDrawerClosed(View view) {
+                getActionBar().setTitle(mTitle);
+                //invalidateOptionsMenu(); // creates call to onPrepareOptionsMenu()
+            }
+
+            public void onDrawerOpened(View drawerView) {
+                getActionBar().setTitle(mDrawerTitle);
+                //invalidateOptionsMenu(); // creates call to onPrepareOptionsMenu()
+            }
+        };
+        mDrawerLayout.setDrawerListener(mDrawerToggle);
+    }
+
+    private class DrawerItemClickListener implements ListView.OnItemClickListener {
+        @Override
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+
+        }
+    }
+}

+ 44 - 0
src/de/tudarmstadt/informatik/hostage/ui2/adapter/DrawerListAdapter.java

@@ -0,0 +1,44 @@
+package de.tudarmstadt.informatik.hostage.ui2.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.util.List;
+
+import de.tudarmstadt.informatik.hostage.R;
+
+/**
+ * @author Alexander Brakowski
+ * @created 13.01.14 16:35
+ */
+public class DrawerListAdapter extends ArrayAdapter<DrawerListItem> {
+    private final Context context;
+    private final List<DrawerListItem> values;
+
+    public DrawerListAdapter(Context context, List<DrawerListItem> objects) {
+        super(context, R.layout.drawer_list_item, objects);
+        this.context = context;
+        this.values  = objects;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        LayoutInflater inflater = (LayoutInflater) context
+                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+        View rowView = inflater.inflate(R.layout.drawer_list_item, parent, false);
+        TextView textView = (TextView) rowView.findViewById(R.id.drawer_listitem_text);
+        ImageView imageView = (ImageView) rowView.findViewById(R.id.drawer_listitem_icon);
+
+        DrawerListItem item = values.get(position);
+        textView.setText(item.text);
+        imageView.setImageResource(item.icon);
+
+        return rowView;
+    }
+}

+ 18 - 0
src/de/tudarmstadt/informatik/hostage/ui2/adapter/DrawerListItem.java

@@ -0,0 +1,18 @@
+package de.tudarmstadt.informatik.hostage.ui2.adapter;
+
+import android.widget.ImageView;
+import android.widget.TextView;
+
+/**
+ * @author Alexander Brakowski
+ * @created 13.01.14 16:37
+ */
+public class DrawerListItem {
+    public int icon;
+    public int text;
+
+    public DrawerListItem(int text, int icon){
+        this.text = text;
+        this.icon = icon;
+    }
+}

+ 2 - 5
target/generated-sources/r/de/tudarmstadt/informatik/hostage/BuildConfig.java

@@ -1,8 +1,5 @@
-/*___Generated_by_IDEA___*/
-
 package de.tudarmstadt.informatik.hostage;
 
-/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
 public final class BuildConfig {
-  public final static boolean DEBUG = Boolean.parseBoolean(null);
-}
+  public static final boolean DEBUG = true;
+}

+ 104 - 83
target/generated-sources/r/de/tudarmstadt/informatik/hostage/R.java

@@ -37,75 +37,88 @@ public final class R {
     }
     public static final class drawable {
         public static final int ic_launcher=0x7f020000;
-        public static final int ic_service_green=0x7f020001;
-        public static final int ic_service_red=0x7f020002;
-        public static final int ic_service_yellow=0x7f020003;
-        public static final int light_green=0x7f020004;
-        public static final int light_green_large=0x7f020005;
-        public static final int light_grey=0x7f020006;
-        public static final int light_grey_large=0x7f020007;
-        public static final int light_red=0x7f020008;
-        public static final int light_red_large=0x7f020009;
-        public static final int light_yellow=0x7f02000a;
-        public static final int light_yellow_large=0x7f02000b;
+        public static final int ic_menu_gallery=0x7f020001;
+        public static final int ic_menu_home=0x7f020002;
+        public static final int ic_menu_info_details=0x7f020003;
+        public static final int ic_menu_mapmode=0x7f020004;
+        public static final int ic_menu_set_as=0x7f020005;
+        public static final int ic_menu_settings_holo_light=0x7f020006;
+        public static final int ic_service_green=0x7f020007;
+        public static final int ic_service_red=0x7f020008;
+        public static final int ic_service_yellow=0x7f020009;
+        public static final int light_green=0x7f02000a;
+        public static final int light_green_large=0x7f02000b;
+        public static final int light_grey=0x7f02000c;
+        public static final int light_grey_large=0x7f02000d;
+        public static final int light_red=0x7f02000e;
+        public static final int light_red_large=0x7f02000f;
+        public static final int light_yellow=0x7f020010;
+        public static final int light_yellow_large=0x7f020011;
     }
     public static final class id {
-        public static final int RecordTextFieldBSSID=0x7f0c002a;
-        public static final int RecordTextFieldProtocol=0x7f0c002c;
-        public static final int RecordTextFieldSSID=0x7f0c002b;
-        public static final int RecordTextFieldTimestamp=0x7f0c002d;
-        public static final int TextViewServices=0x7f0c001a;
-        public static final int action_about=0x7f0c002f;
-        public static final int action_settings=0x7f0c002e;
-        public static final int attack_info=0x7f0c0026;
-        public static final int buttonDeleteLog=0x7f0c0025;
-        public static final int buttonExportDatabase=0x7f0c0023;
-        public static final int buttonShowLog=0x7f0c0010;
-        public static final int buttonUploadLog=0x7f0c0024;
-        public static final int checkBoxParanoid=0x7f0c000e;
-        public static final int imageViewLight=0x7f0c000d;
-        public static final int layoutContainer=0x7f0c001d;
+        public static final int RecordTextFieldBSSID=0x7f0c002f;
+        public static final int RecordTextFieldProtocol=0x7f0c0031;
+        public static final int RecordTextFieldSSID=0x7f0c0030;
+        public static final int RecordTextFieldTimestamp=0x7f0c0032;
+        public static final int TextViewServices=0x7f0c001d;
+        public static final int action_about=0x7f0c0034;
+        public static final int action_settings=0x7f0c0033;
+        public static final int attack_info=0x7f0c0029;
+        public static final int buttonDeleteLog=0x7f0c0028;
+        public static final int buttonExportDatabase=0x7f0c0026;
+        public static final int buttonShowLog=0x7f0c0013;
+        public static final int buttonUploadLog=0x7f0c0027;
+        public static final int checkBoxParanoid=0x7f0c0011;
+        public static final int content_frame=0x7f0c000b;
+        public static final int drawer_layout=0x7f0c000a;
+        public static final int drawer_listitem_icon=0x7f0c002a;
+        public static final int drawer_listitem_text=0x7f0c002b;
+        public static final int imageViewLight=0x7f0c0010;
+        public static final int layoutContainer=0x7f0c0020;
+        public static final int left_drawer=0x7f0c000c;
         public static final int link_github=0x7f0c0004;
         public static final int link_tracing=0x7f0c0005;
         public static final int link_website=0x7f0c0003;
-        public static final int listViewProtocols=0x7f0c001b;
-        public static final int loglistview=0x7f0c000a;
-        public static final int textFirstAttack=0x7f0c001e;
-        public static final int textFirstAttackValue=0x7f0c001f;
-        public static final int textLastAttack=0x7f0c0020;
-        public static final int textLastAttackValue=0x7f0c0021;
-        public static final int textLogFile=0x7f0c0022;
-        public static final int textStatistics=0x7f0c001c;
-        public static final int textViewBSSID=0x7f0c0014;
-        public static final int textViewBSSIDValue=0x7f0c0015;
-        public static final int textViewConnections=0x7f0c0028;
-        public static final int textViewConnectionsValue=0x7f0c0029;
-        public static final int textViewDetails=0x7f0c0011;
-        public static final int textViewExternalIP=0x7f0c0018;
-        public static final int textViewExternalIPValue=0x7f0c0019;
-        public static final int textViewInternalIP=0x7f0c0016;
-        public static final int textViewInternalIPValue=0x7f0c0017;
-        public static final int textViewProtocol=0x7f0c0027;
-        public static final int textViewSSID=0x7f0c0012;
-        public static final int textViewSSIDValue=0x7f0c0013;
-        public static final int textViewStatus=0x7f0c000c;
+        public static final int listViewProtocols=0x7f0c001e;
+        public static final int loglistview=0x7f0c000d;
+        public static final int textFirstAttack=0x7f0c0021;
+        public static final int textFirstAttackValue=0x7f0c0022;
+        public static final int textLastAttack=0x7f0c0023;
+        public static final int textLastAttackValue=0x7f0c0024;
+        public static final int textLogFile=0x7f0c0025;
+        public static final int textStatistics=0x7f0c001f;
+        public static final int textViewBSSID=0x7f0c0017;
+        public static final int textViewBSSIDValue=0x7f0c0018;
+        public static final int textViewConnections=0x7f0c002d;
+        public static final int textViewConnectionsValue=0x7f0c002e;
+        public static final int textViewDetails=0x7f0c0014;
+        public static final int textViewExternalIP=0x7f0c001b;
+        public static final int textViewExternalIPValue=0x7f0c001c;
+        public static final int textViewInternalIP=0x7f0c0019;
+        public static final int textViewInternalIPValue=0x7f0c001a;
+        public static final int textViewProtocol=0x7f0c002c;
+        public static final int textViewSSID=0x7f0c0015;
+        public static final int textViewSSIDValue=0x7f0c0016;
+        public static final int textViewStatus=0x7f0c000f;
         public static final int text_author_1=0x7f0c0007;
         public static final int text_author_2=0x7f0c0008;
         public static final int text_author_3=0x7f0c0009;
         public static final int text_authors=0x7f0c0006;
         public static final int text_description=0x7f0c0002;
         public static final int text_version=0x7f0c0000;
-        public static final int toggleButtonOnOff=0x7f0c000f;
+        public static final int toggleButtonOnOff=0x7f0c0012;
         public static final int version=0x7f0c0001;
-        public static final int viewAnimator=0x7f0c000b;
+        public static final int viewAnimator=0x7f0c000e;
     }
     public static final class layout {
         public static final int activity_about=0x7f030000;
-        public static final int activity_loglist=0x7f030001;
-        public static final int activity_main=0x7f030002;
-        public static final int activity_viewlog=0x7f030003;
-        public static final int list_view_protocols_row=0x7f030004;
-        public static final int loglist_row=0x7f030005;
+        public static final int activity_drawer_main=0x7f030001;
+        public static final int activity_loglist=0x7f030002;
+        public static final int activity_main=0x7f030003;
+        public static final int activity_viewlog=0x7f030004;
+        public static final int drawer_list_item=0x7f030005;
+        public static final int list_view_protocols_row=0x7f030006;
+        public static final int loglist_row=0x7f030007;
     }
     public static final class menu {
         public static final int main=0x7f0b0000;
@@ -118,10 +131,10 @@ public final class R {
         public static final int action_about=0x7f090002;
         public static final int action_settings=0x7f090001;
         public static final int app_name=0x7f090000;
-        public static final int authors=0x7f090023;
-        public static final int authors_l=0x7f090025;
-        public static final int authors_m=0x7f090024;
-        public static final int authors_w=0x7f090026;
+        public static final int authors=0x7f09002b;
+        public static final int authors_l=0x7f09002d;
+        public static final int authors_m=0x7f09002c;
+        public static final int authors_w=0x7f09002e;
         public static final int bssid=0x7f090009;
         public static final int cancel=0x7f090015;
         public static final int capital_off=0x7f090004;
@@ -131,45 +144,53 @@ public final class R {
         public static final int database=0x7f09000f;
         public static final int delete=0x7f090014;
         public static final int delete_dialog_title=0x7f090018;
-        public static final int description=0x7f09001f;
+        public static final int description=0x7f090027;
         public static final int details=0x7f090007;
         public static final int dialog_clear_database=0x7f090016;
         public static final int dialog_clear_database_date=0x7f090019;
+        public static final int drawer_app_info=0x7f090025;
+        public static final int drawer_close=0x7f09001f;
+        public static final int drawer_open=0x7f09001e;
+        public static final int drawer_overview=0x7f090020;
+        public static final int drawer_records=0x7f090022;
+        public static final int drawer_services=0x7f090023;
+        public static final int drawer_settings=0x7f090024;
+        public static final int drawer_threat_map=0x7f090021;
         public static final int export_dialog_title=0x7f090017;
         public static final int external_ip=0x7f09000b;
         public static final int firstAttack=0x7f090011;
         public static final int internal_ip=0x7f09000a;
         public static final int lastAttack=0x7f090012;
-        public static final int link_github=0x7f090021;
-        public static final int link_tracing=0x7f090022;
-        public static final int link_website=0x7f090020;
+        public static final int link_github=0x7f090029;
+        public static final int link_tracing=0x7f09002a;
+        public static final int link_website=0x7f090028;
         public static final int log_actions=0x7f090010;
         public static final int paranoid=0x7f090006;
-        public static final int pref_alarm=0x7f090028;
-        public static final int pref_alarm_default=0x7f090029;
-        public static final int pref_alarm_summ=0x7f09002a;
-        public static final int pref_connection_settings=0x7f09003a;
-        public static final int pref_external_location_title=0x7f09002e;
-        public static final int pref_external_storage_summ=0x7f09002d;
-        public static final int pref_external_storage_title=0x7f09002c;
-        public static final int pref_max_connections=0x7f090034;
-        public static final int pref_max_connections_default=0x7f090035;
-        public static final int pref_notification=0x7f09002f;
-        public static final int pref_sleeptime=0x7f090038;
-        public static final int pref_sleeptime_default=0x7f090039;
-        public static final int pref_storage=0x7f09002b;
-        public static final int pref_timeout=0x7f090036;
-        public static final int pref_timeout_default=0x7f090037;
-        public static final int pref_upload=0x7f090032;
-        public static final int pref_upload_server=0x7f090033;
-        public static final int pref_vibration=0x7f090030;
-        public static final int pref_vibration_summ=0x7f090031;
+        public static final int pref_alarm=0x7f090030;
+        public static final int pref_alarm_default=0x7f090031;
+        public static final int pref_alarm_summ=0x7f090032;
+        public static final int pref_connection_settings=0x7f090042;
+        public static final int pref_external_location_title=0x7f090036;
+        public static final int pref_external_storage_summ=0x7f090035;
+        public static final int pref_external_storage_title=0x7f090034;
+        public static final int pref_max_connections=0x7f09003c;
+        public static final int pref_max_connections_default=0x7f09003d;
+        public static final int pref_notification=0x7f090037;
+        public static final int pref_sleeptime=0x7f090040;
+        public static final int pref_sleeptime_default=0x7f090041;
+        public static final int pref_storage=0x7f090033;
+        public static final int pref_timeout=0x7f09003e;
+        public static final int pref_timeout_default=0x7f09003f;
+        public static final int pref_upload=0x7f09003a;
+        public static final int pref_upload_server=0x7f09003b;
+        public static final int pref_vibration=0x7f090038;
+        public static final int pref_vibration_summ=0x7f090039;
         public static final int services=0x7f09000c;
-        public static final int settings=0x7f090027;
+        public static final int settings=0x7f09002f;
         public static final int ssid=0x7f090008;
         public static final int statistics=0x7f09000e;
         public static final int status=0x7f090005;
-        public static final int text_version=0x7f09001e;
+        public static final int text_version=0x7f090026;
     }
     public static final class style {
         /** 

BIN
target/hostage.jar


+ 49 - 43
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,86 +1,92 @@
-de/tudarmstadt/informatik/hostage/ui/ViewLogTable.class
 de/tudarmstadt/informatik/hostage/handler/AbstractHandler.class
-de/tudarmstadt/informatik/hostage/R.class
-de/tudarmstadt/informatik/hostage/ConnectionRegister.class
 de/tudarmstadt/informatik/hostage/commons/HelperUtils.class
 de/tudarmstadt/informatik/hostage/net/MySSLSocketFactory.class
 de/tudarmstadt/informatik/hostage/ui/ViewLog.class
 de/tudarmstadt/informatik/hostage/protocol/TELNET.class
 de/tudarmstadt/informatik/hostage/R$dimen.class
 de/tudarmstadt/informatik/hostage/ui/MainActivity$5.class
-de/tudarmstadt/informatik/hostage/protocol/HTTPS.class
-de/tudarmstadt/informatik/hostage/format/TELNETFormatter.class
 de/tudarmstadt/informatik/hostage/system/PrivilegedPort.class
+de/tudarmstadt/informatik/hostage/protocol/HTTPS.class
 de/tudarmstadt/informatik/hostage/io/ByteArrayReaderWriter.class
 de/tudarmstadt/informatik/hostage/protocol/SMB$SMBPacket.class
 de/tudarmstadt/informatik/hostage/ui/ListViewAdapter.class
-de/tudarmstadt/informatik/hostage/HoneyService$LocalBinder.class
-de/tudarmstadt/informatik/hostage/ui/ViewLog$5.class
 de/tudarmstadt/informatik/hostage/format/DefaultFormatter.class
-de/tudarmstadt/informatik/hostage/protocol/SSLProtocol.class
 de/tudarmstadt/informatik/hostage/ui/MainActivity$SetExternalIPTask.class
-de/tudarmstadt/informatik/hostage/HoneyService$1.class
 de/tudarmstadt/informatik/hostage/ui/MainActivity$4.class
+de/tudarmstadt/informatik/hostage/HoneyService$1.class
 de/tudarmstadt/informatik/hostage/ui/ViewLog$2.class
-de/tudarmstadt/informatik/hostage/format/SMBFormatter.class
-de/tudarmstadt/informatik/hostage/ui/MainActivity$3.class
 de/tudarmstadt/informatik/hostage/protocol/TELNET$1.class
 de/tudarmstadt/informatik/hostage/protocol/FTP$STATE.class
 de/tudarmstadt/informatik/hostage/net/MyServerSocketFactory.class
-de/tudarmstadt/informatik/hostage/protocol/TELNET$STATE.class
 de/tudarmstadt/informatik/hostage/protocol/FTP.class
-de/tudarmstadt/informatik/hostage/HoneyListener.class
 de/tudarmstadt/informatik/hostage/R$color.class
 de/tudarmstadt/informatik/hostage/logging/Record.class
-de/tudarmstadt/informatik/hostage/ui/ViewLog$1.class
-de/tudarmstadt/informatik/hostage/ui/SettingsActivity.class
-de/tudarmstadt/informatik/hostage/protocol/FTP$1.class
+de/tudarmstadt/informatik/hostage/ui2/MainActivity$DrawerItemClickListener.class
 de/tudarmstadt/informatik/hostage/net/MySSLSocketFactory$1.class
-de/tudarmstadt/informatik/hostage/wrapper/ByteArray.class
 de/tudarmstadt/informatik/hostage/BuildConfig.class
 de/tudarmstadt/informatik/hostage/R$style.class
-de/tudarmstadt/informatik/hostage/R$string.class
 de/tudarmstadt/informatik/hostage/protocol/MySQL$STATE.class
-de/tudarmstadt/informatik/hostage/protocol/SMB.class
-de/tudarmstadt/informatik/hostage/io/ReaderWriter.class
-de/tudarmstadt/informatik/hostage/ui/ViewLog$6.class
-de/tudarmstadt/informatik/hostage/HoneyService.class
-de/tudarmstadt/informatik/hostage/ui/AboutActivity.class
 de/tudarmstadt/informatik/hostage/ui/MainActivity$2.class
-de/tudarmstadt/informatik/hostage/R$attr.class
 de/tudarmstadt/informatik/hostage/R$anim.class
-de/tudarmstadt/informatik/hostage/protocol/SSH.class
-de/tudarmstadt/informatik/hostage/ui/ViewLog$4.class
-de/tudarmstadt/informatik/hostage/protocol/SMB$STATE.class
-de/tudarmstadt/informatik/hostage/logging/SQLLogger.class
-de/tudarmstadt/informatik/hostage/protocol/ECHO.class
 de/tudarmstadt/informatik/hostage/protocol/Protocol$TALK_FIRST.class
 de/tudarmstadt/informatik/hostage/ui/ViewLog$8.class
-de/tudarmstadt/informatik/hostage/R$id.class
-de/tudarmstadt/informatik/hostage/protocol/SSH$STATE.class
 de/tudarmstadt/informatik/hostage/logging/DatabaseHandler.class
-de/tudarmstadt/informatik/hostage/protocol/Protocol.class
-de/tudarmstadt/informatik/hostage/ui/MainActivity.class
+de/tudarmstadt/informatik/hostage/R$id.class
+de/tudarmstadt/informatik/hostage/ui2/MainActivity.class
 de/tudarmstadt/informatik/hostage/ui/ViewLog$7.class
+de/tudarmstadt/informatik/hostage/protocol/Protocol.class
 de/tudarmstadt/informatik/hostage/format/ProtocolFormatter.class
-de/tudarmstadt/informatik/hostage/protocol/MySQL.class
-de/tudarmstadt/informatik/hostage/logging/Record$TYPE.class
 de/tudarmstadt/informatik/hostage/R$drawable.class
-de/tudarmstadt/informatik/hostage/ui/MainActivity$1.class
-de/tudarmstadt/informatik/hostage/R$layout.class
 de/tudarmstadt/informatik/hostage/logging/Logger.class
+de/tudarmstadt/informatik/hostage/R$layout.class
 de/tudarmstadt/informatik/hostage/format/LogViewFormatter.class
 de/tudarmstadt/informatik/hostage/protocol/SSH$1.class
 de/tudarmstadt/informatik/hostage/protocol/MySQL$1.class
-de/tudarmstadt/informatik/hostage/handler/StringHandler.class
+de/tudarmstadt/informatik/hostage/ui/ViewLog$3.class
 de/tudarmstadt/informatik/hostage/R$xml.class
 de/tudarmstadt/informatik/hostage/protocol/HTTP.class
-de/tudarmstadt/informatik/hostage/ui/ViewLog$3.class
 de/tudarmstadt/informatik/hostage/format/MySQLFormatter.class
-de/tudarmstadt/informatik/hostage/ui/MainActivity$6.class
+de/tudarmstadt/informatik/hostage/Manifest.class
 de/tudarmstadt/informatik/hostage/protocol/SMB$1.class
-de/tudarmstadt/informatik/hostage/R$menu.class
 de/tudarmstadt/informatik/hostage/io/StringReaderWriter.class
-de/tudarmstadt/informatik/hostage/handler/ByteArrayHandler.class
-de/tudarmstadt/informatik/hostage/ui/ViewLog$9.class
 de/tudarmstadt/informatik/hostage/R$array.class
+de/tudarmstadt/informatik/hostage/ui/ViewLog$9.class
+de/tudarmstadt/informatik/hostage/ui/ViewLogTable.class
+de/tudarmstadt/informatik/hostage/R.class
+de/tudarmstadt/informatik/hostage/ConnectionRegister.class
+de/tudarmstadt/informatik/hostage/format/TELNETFormatter.class
+de/tudarmstadt/informatik/hostage/HoneyService$LocalBinder.class
+de/tudarmstadt/informatik/hostage/ui/ViewLog$5.class
+de/tudarmstadt/informatik/hostage/protocol/SSLProtocol.class
+de/tudarmstadt/informatik/hostage/format/SMBFormatter.class
+de/tudarmstadt/informatik/hostage/ui/MainActivity$3.class
+de/tudarmstadt/informatik/hostage/protocol/TELNET$STATE.class
+de/tudarmstadt/informatik/hostage/HoneyListener.class
+de/tudarmstadt/informatik/hostage/ui2/adapter/DrawerListAdapter.class
+de/tudarmstadt/informatik/hostage/ui/ViewLog$1.class
+de/tudarmstadt/informatik/hostage/ui/SettingsActivity.class
+de/tudarmstadt/informatik/hostage/protocol/FTP$1.class
+de/tudarmstadt/informatik/hostage/ui2/MainActivity$1.class
+de/tudarmstadt/informatik/hostage/wrapper/ByteArray.class
+de/tudarmstadt/informatik/hostage/R$string.class
+de/tudarmstadt/informatik/hostage/ui/ViewLog$6.class
+de/tudarmstadt/informatik/hostage/protocol/SMB.class
+de/tudarmstadt/informatik/hostage/io/ReaderWriter.class
+de/tudarmstadt/informatik/hostage/HoneyService.class
+de/tudarmstadt/informatik/hostage/ui/AboutActivity.class
+de/tudarmstadt/informatik/hostage/R$attr.class
+de/tudarmstadt/informatik/hostage/protocol/SSH.class
+de/tudarmstadt/informatik/hostage/ui/ViewLog$4.class
+de/tudarmstadt/informatik/hostage/logging/SQLLogger.class
+de/tudarmstadt/informatik/hostage/protocol/SMB$STATE.class
+de/tudarmstadt/informatik/hostage/protocol/ECHO.class
+de/tudarmstadt/informatik/hostage/protocol/SSH$STATE.class
+de/tudarmstadt/informatik/hostage/ui/MainActivity.class
+de/tudarmstadt/informatik/hostage/protocol/MySQL.class
+de/tudarmstadt/informatik/hostage/ui/MainActivity$1.class
+de/tudarmstadt/informatik/hostage/logging/Record$TYPE.class
+de/tudarmstadt/informatik/hostage/ui2/adapter/DrawerListItem.class
+de/tudarmstadt/informatik/hostage/handler/StringHandler.class
+de/tudarmstadt/informatik/hostage/ui/MainActivity$6.class
+de/tudarmstadt/informatik/hostage/R$menu.class
+de/tudarmstadt/informatik/hostage/handler/ByteArrayHandler.class