Browse Source

Merge branch 'master' of https://julien.clauter@git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2.git

Julien 10 years ago
parent
commit
1dda2097ed
64 changed files with 914 additions and 435 deletions
  1. 3 0
      .gitignore
  2. 13 3
      AndroidManifest.xml
  3. 33 2
      pom.xml
  4. 1 0
      project.properties
  5. BIN
      res/drawable-hdpi/ic_action_accept.png
  6. BIN
      res/drawable-hdpi/ic_menu_gallery.png
  7. BIN
      res/drawable-hdpi/ic_menu_home.png
  8. BIN
      res/drawable-hdpi/ic_menu_info_details.png
  9. BIN
      res/drawable-hdpi/ic_menu_mapmode.png
  10. BIN
      res/drawable-hdpi/ic_menu_preferences.png
  11. BIN
      res/drawable-hdpi/ic_menu_set_as.png
  12. BIN
      res/drawable-hdpi/ic_navigation_drawer.png
  13. BIN
      res/drawable-mdpi/ic_action_accept.png
  14. BIN
      res/drawable-mdpi/ic_menu_gallery.png
  15. BIN
      res/drawable-mdpi/ic_menu_home.png
  16. BIN
      res/drawable-mdpi/ic_menu_info_details.png
  17. BIN
      res/drawable-mdpi/ic_menu_mapmode.png
  18. BIN
      res/drawable-mdpi/ic_menu_preferences.png
  19. BIN
      res/drawable-mdpi/ic_menu_set_as.png
  20. BIN
      res/drawable-mdpi/ic_navigation_drawer.png
  21. BIN
      res/drawable-xhdpi/ic_action_accept.png
  22. BIN
      res/drawable-xhdpi/ic_menu_gallery.png
  23. BIN
      res/drawable-xhdpi/ic_menu_home.png
  24. BIN
      res/drawable-xhdpi/ic_menu_info_details.png
  25. BIN
      res/drawable-xhdpi/ic_menu_mapmode.png
  26. BIN
      res/drawable-xhdpi/ic_menu_preferences.png
  27. BIN
      res/drawable-xhdpi/ic_menu_set_as.png
  28. BIN
      res/drawable-xhdpi/ic_navigation_drawer.png
  29. BIN
      res/drawable-xxhdpi/ic_menu_gallery.png
  30. BIN
      res/drawable-xxhdpi/ic_menu_home.png
  31. BIN
      res/drawable-xxhdpi/ic_menu_info_details.png
  32. BIN
      res/drawable-xxhdpi/ic_menu_mapmode.png
  33. BIN
      res/drawable-xxhdpi/ic_menu_preferences.png
  34. BIN
      res/drawable-xxhdpi/ic_menu_set_as.png
  35. BIN
      res/drawable-xxhdpi/ic_navigation_drawer.png
  36. 27 0
      res/drawable/panel_bg.xml
  37. 20 0
      res/drawable/panel_right_border.xml
  38. 21 0
      res/layout/activity_drawer_main.xml
  39. 29 0
      res/layout/drawer_list_item.xml
  40. 170 0
      res/layout/fragment_home.xml
  41. 12 0
      res/layout/fragment_profile_manager.xml
  42. 53 0
      res/layout/profile_manager_list_item.xml
  43. 2 0
      res/values/colors.xml
  44. 11 2
      res/values/strings.xml
  45. 2 3
      src/de/tudarmstadt/informatik/hostage/logging/DatabaseHandler.java
  46. 170 0
      src/de/tudarmstadt/informatik/hostage/ui2/activity/MainActivity.java
  47. 45 0
      src/de/tudarmstadt/informatik/hostage/ui2/adapter/DrawerListAdapter.java
  48. 57 0
      src/de/tudarmstadt/informatik/hostage/ui2/adapter/ProfileManagerListAdapter.java
  49. 27 0
      src/de/tudarmstadt/informatik/hostage/ui2/fragment/HomeFragment.java
  50. 87 0
      src/de/tudarmstadt/informatik/hostage/ui2/fragment/HomeGLRenderer.java
  51. 24 0
      src/de/tudarmstadt/informatik/hostage/ui2/fragment/HomeGLSurfaceView.java
  52. 60 0
      src/de/tudarmstadt/informatik/hostage/ui2/fragment/ProfileManagerFragment.java
  53. 18 0
      src/de/tudarmstadt/informatik/hostage/ui2/model/DrawerListItem.java
  54. 29 0
      src/de/tudarmstadt/informatik/hostage/ui2/model/ProfileListItem.java
  55. 0 5
      target/classes/META-INF/MANIFEST.MF
  56. 0 7
      target/classes/META-INF/maven/de.tudarmstadt.informatik/hostage/pom.properties
  57. 0 82
      target/classes/META-INF/maven/de.tudarmstadt.informatik/hostage/pom.xml
  58. BIN
      target/generated-sources/combined-assets/assets/p
  59. 0 5
      target/generated-sources/r/de/tudarmstadt/informatik/hostage/BuildConfig.java
  60. 0 193
      target/generated-sources/r/de/tudarmstadt/informatik/hostage/R.java
  61. BIN
      target/hostage.jar
  62. 0 5
      target/maven-archiver/pom.properties
  63. 0 86
      target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  64. 0 42
      target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

+ 3 - 0
.gitignore

@@ -23,3 +23,6 @@ proguard/
 *.ipr
 *.iws
 .idea/
+
+#Ignore target folder
+target/

+ 13 - 3
AndroidManifest.xml

@@ -5,14 +5,19 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="14"
         android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    
+    <!-- Tell the system this app requires OpenGL ES 2.0. -->
+	<uses-feature android:glEsVersion="0x00020000" android:required="true" />
 
     <application
         android:allowBackup="true"
@@ -21,7 +26,7 @@
         android:theme="@style/AppTheme"
         android:debuggable="true" >
         <activity
-            android:name="de.tudarmstadt.informatik.hostage.ui.MainActivity"
+            android:name="de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name" >
             <intent-filter>
@@ -30,6 +35,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" >
@@ -51,4 +61,4 @@
         </service>
     </application>
 
-</manifest>
+</manifest>

+ 33 - 2
pom.xml

@@ -1,3 +1,34 @@
+<!--
+ IMPORTANT
+ ==============================================
+ This project maven configuration depends on configurations defined in user profile files.
+ Please, if you still do not have created the maven profile file, create it like this:
+
+
+ - %USER_HOME%/.m2/settings.xml:
+ ´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´
+    <settings>
+        <profiles>
+            <profile>
+                <id>hostageUserConfig</id>
+                <properties>
+                    <android.compatibility.version>19</android.compatibility.version>
+                    <android.version>4.4_r1</android.version>
+                </properties>
+            </profile>
+        </profiles>
+
+        <activeProfiles>
+            <activeProfile>hostageUserConfig</activeProfile>
+        </activeProfiles>
+    </settings>
+
+ ´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´´
+ The important part here is to set the right version numbers in the defined properties. These version
+ numbers are system-dependant and can't be downloaded from the maven repository, since they do not
+ exist there.
+ ==============================================
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
@@ -10,13 +41,13 @@
 		<dependency>
 			<groupId>android</groupId>
 			<artifactId>android</artifactId>
-			<version>4.4_r1</version>
+			<version>${android.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>android.support</groupId>
 			<artifactId>compatibility-v4</artifactId>
-			<version>19.0.0</version>
+			<version>${android.compatibility.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.roboguice</groupId>

+ 1 - 0
project.properties

@@ -12,3 +12,4 @@
 
 # Project target.
 target=android-19
+android.library=false

BIN
res/drawable-hdpi/ic_action_accept.png


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_preferences.png


BIN
res/drawable-hdpi/ic_menu_set_as.png


BIN
res/drawable-hdpi/ic_navigation_drawer.png


BIN
res/drawable-mdpi/ic_action_accept.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_preferences.png


BIN
res/drawable-mdpi/ic_menu_set_as.png


BIN
res/drawable-mdpi/ic_navigation_drawer.png


BIN
res/drawable-xhdpi/ic_action_accept.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_preferences.png


BIN
res/drawable-xhdpi/ic_menu_set_as.png


BIN
res/drawable-xhdpi/ic_navigation_drawer.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_preferences.png


BIN
res/drawable-xxhdpi/ic_menu_set_as.png


BIN
res/drawable-xxhdpi/ic_navigation_drawer.png


+ 27 - 0
res/drawable/panel_bg.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Bottom 3dp Shadow -->
+    <item>
+        <shape android:shape="rectangle">
+
+            <solid android:color="#C7C6C5" />
+            <corners android:radius="4dp" />
+
+        </shape>
+    </item>
+
+    <!-- White Top color -->
+    <item android:bottom="4px">
+
+        <shape android:shape="rectangle">
+
+            <solid android:color="#FFFFFF" />
+            <corners android:radius="4dp" />
+
+
+        </shape>
+
+    </item>
+
+</layer-list>

+ 20 - 0
res/drawable/panel_right_border.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape
+            android:shape="rectangle">
+            <stroke android:width="1dp" android:color="#FF000000" />
+            <solid android:color="#FFFFFFFF" />
+
+        </shape>
+    </item>
+
+    <item android:right="1dp" android:left="0dp" android:top="0dp" android:bottom="0dp">
+        <shape
+            android:shape="rectangle">
+            <stroke android:width="1dp" android:color="#FFDDDDDD" />
+            <solid android:color="#FFFFFFFF" />
+        </shape>
+    </item>
+
+</layer-list>

+ 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>

+ 170 - 0
res/layout/fragment_home.xml

@@ -0,0 +1,170 @@
+<?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="match_parent"
+    android:orientation="vertical"
+    android:weightSum="1" >
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1" >
+
+        <de.tudarmstadt.informatik.hostage.ui2.fragment.HomeGLSurfaceView
+            android:id="@+id/surfaceview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </FrameLayout>
+
+    <RelativeLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:weightSum="1"
+        android:baselineAligned="false">
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Current connection monitor"
+            android:textStyle="bold"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="false"
+            android:layout_alignParentEnd="true"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="15dp" />
+
+        <Switch
+            android:id="@+id/switch1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_alignParentLeft="false"
+            android:layout_marginLeft="0dp"
+            android:layout_alignParentTop="false"
+            android:layout_marginTop="0dp"
+            android:layout_gravity="right"
+            android:layout_alignParentEnd="false"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="false"
+            android:layout_marginRight="15dp"
+            android:textSize="10sp"
+            android:checked="true" />
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="fill_parent"
+        android:layout_height="1dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:background="@android:color/darker_gray" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="171dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:orientation="vertical"
+        android:weightSum="1"
+        android:layout_gravity="bottom">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/textView5"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="This network is being monitored by HosTaGe"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/holo_dark_green"
+                android:textSize="11sp"
+                android:layout_gravity="center"
+                android:layout_below="@+id/textView2"
+                android:layout_centerHorizontal="true" />
+
+            <TextView
+                android:id="@+id/textView2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="Eduroam"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textSize="26sp"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="21dp" />
+
+            <ImageView
+                android:id="@+id/imageView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@android:drawable/presence_online"
+                android:layout_marginRight="10dp"
+                android:layout_alignBottom="@+id/textView5"
+                android:layout_toLeftOf="@+id/textView5" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/imageView2"
+                android:src="@android:drawable/ic_menu_info_details"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true" />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/textView3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="Insecure"
+            android:textAppearance="@android:style/TextAppearance.Holo.Small"
+            android:textColor="@color/holo_red"
+            android:textSize="13sp"
+            android:layout_marginTop="10dp" />
+
+        <TextView
+            android:id="@+id/textView4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="125 attacks recorded"
+            android:textColor="@color/holo_red"
+            android:textSize="11sp" />
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Active profile: "
+                android:id="@+id/textView6"
+                android:textStyle="bold"
+                android:textSize="11sp"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="10dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Windows 7"
+                android:id="@+id/textView7"
+                android:textSize="11sp"
+                android:layout_below="@+id/textView6"
+                android:layout_centerHorizontal="true" />
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+</LinearLayout>

+ 12 - 0
res/layout/fragment_profile_manager.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ListView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/profile_manager_listview"
+    android:choiceMode="singleChoice"
+    android:background="#F2F2F2"
+    android:dividerHeight="10dp"
+    android:divider="@android:color/transparent"
+    android:padding="5dp" />

+ 53 - 0
res/layout/profile_manager_list_item.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout 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"
+    android:background="@drawable/panel_bg">
+
+    <TextView
+        android:id="@+id/profile_manager_item_label"
+        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"
+        android:text="Sample title"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."
+        android:id="@+id/profile_manager_item_text"
+        android:layout_below="@+id/profile_manager_item_label"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="16dp"
+        android:textColor="#808080"
+        android:layout_marginRight="80dp"
+        android:visibility="visible"
+        android:singleLine="false"
+        android:phoneNumber="true" />
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/profile_manager_item_activated"
+        android:src="@drawable/ic_action_accept"
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginRight="20dp"
+        android:visibility="visible" />
+
+</RelativeLayout>

+ 2 - 0
res/values/colors.xml

@@ -2,4 +2,6 @@
 <resources>
     	<color name="light_grey">#FFC0C0C0</color>
         <color name="dark_grey">#FF808080</color>
+        <color name="holo_red">#FFF44444</color>
+        <color name="holo_dark_green">#ff669900</color>
 </resources>

+ 11 - 2
res/values/strings.xml

@@ -32,7 +32,16 @@
     <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">Threat Map</string>
+    <string name="drawer_records">Records</string>
+    <string name="drawer_services">Services</string>
+    <string name="drawer_settings">Settings</string>
+    <string name="drawer_profile_manager">Profile Manager</string>
+    <string name="drawer_app_info">Application info</string>
 
 </resources>

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

@@ -568,8 +568,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.
@@ -577,7 +576,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();

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

@@ -0,0 +1,170 @@
+package de.tudarmstadt.informatik.hostage.ui2.activity;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.support.v4.app.ActionBarDrawerToggle;
+import android.support.v4.widget.DrawerLayout;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+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.fragment.HomeFragment;
+import de.tudarmstadt.informatik.hostage.ui2.fragment.ProfileManagerFragment;
+import de.tudarmstadt.informatik.hostage.ui2.model.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;
+
+    private ArrayList<DrawerListItem> drawerItems;
+
+    public static volatile Context context;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        MainActivity.context = getApplicationContext();
+
+        setContentView(R.layout.activity_drawer_main);
+
+        ActionBar actionBar = getActionBar();
+        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE
+                | ActionBar.DISPLAY_SHOW_HOME
+                | ActionBar.DISPLAY_HOME_AS_UP);
+
+        mTitle = mDrawerTitle = getTitle();
+        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+        mDrawerList = (ListView) findViewById(R.id.left_drawer);
+
+        drawerItems = new ArrayList<DrawerListItem>();
+        drawerItems.add(new DrawerListItem(R.string.drawer_overview, R.drawable.ic_menu_home));
+        drawerItems.add(new DrawerListItem(R.string.drawer_threat_map, R.drawable.ic_menu_mapmode));
+        drawerItems.add(new DrawerListItem(R.string.drawer_records, R.drawable.ic_menu_gallery));
+        drawerItems.add(new DrawerListItem(R.string.drawer_services, R.drawable.ic_menu_set_as));
+        drawerItems.add(new DrawerListItem(R.string.drawer_profile_manager, R.drawable.ic_menu_set_as));
+        drawerItems.add(new DrawerListItem(R.string.drawer_settings, R.drawable.ic_menu_preferences));
+        drawerItems.add(new DrawerListItem(R.string.drawer_app_info, R.drawable.ic_menu_info_details));
+
+
+        DrawerListAdapter listAdapter = new DrawerListAdapter(this, drawerItems);
+
+        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_navigation_drawer,  /* 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);
+        
+        //HomeGLSurfaceView surfaceView = (HomeGLSurfaceView)findViewById(R.id.surfaceview);
+
+        if (savedInstanceState == null) {
+            // on first time display view for first nav item
+            displayView(0);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // toggle nav drawer on selecting action bar app icon/title
+        if (mDrawerToggle.onOptionsItemSelected(item)) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    @Override
+    public void setTitle(CharSequence title) {
+        mTitle = title;
+        getActionBar().setTitle(mTitle);
+    }
+
+    /**
+     * When using the ActionBarDrawerToggle, you must call it during
+     * onPostCreate() and onConfigurationChanged()...
+     */
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        // Sync the toggle state after onRestoreInstanceState has occurred.
+        mDrawerToggle.syncState();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        // Pass any configuration change to the drawer toggls
+        mDrawerToggle.onConfigurationChanged(newConfig);
+    }
+
+    private void displayView(int position) {
+        // update the main content by replacing fragments
+        Fragment fragment = null;
+        switch (position) {
+            case 0:
+                fragment = new HomeFragment();
+                break;
+            case 4:
+                fragment = new ProfileManagerFragment();
+                break;
+            default:
+                break;
+        }
+
+        if (fragment != null) {
+            FragmentManager fragmentManager = getFragmentManager();
+            fragmentManager.beginTransaction()
+                    .replace(R.id.content_frame, fragment).commit();
+
+            // update selected item and title, then close the drawer
+            mDrawerList.setItemChecked(position, true);
+            mDrawerList.setSelection(position);
+            setTitle(drawerItems.get(position).text);
+            mDrawerLayout.closeDrawer(mDrawerList);
+        }
+    }
+
+    private class DrawerItemClickListener implements ListView.OnItemClickListener {
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            displayView(position);
+        }
+    }
+}

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

@@ -0,0 +1,45 @@
+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;
+import de.tudarmstadt.informatik.hostage.ui2.model.DrawerListItem;
+
+/**
+ * @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;
+    }
+}

+ 57 - 0
src/de/tudarmstadt/informatik/hostage/ui2/adapter/ProfileManagerListAdapter.java

@@ -0,0 +1,57 @@
+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.RelativeLayout;
+import android.widget.TextView;
+
+import java.util.List;
+
+import de.tudarmstadt.informatik.hostage.R;
+import de.tudarmstadt.informatik.hostage.ui2.model.DrawerListItem;
+import de.tudarmstadt.informatik.hostage.ui2.model.ProfileListItem;
+
+/**
+ * @author Alexander Brakowski
+ * @created 14.01.14 18:00
+ */
+public class ProfileManagerListAdapter extends ArrayAdapter<ProfileListItem> {
+    private final Context context;
+    private final List<ProfileListItem> values;
+
+    public ProfileManagerListAdapter(Context context, List<ProfileListItem> 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.profile_manager_list_item, parent, false);
+        TextView labelView = (TextView) rowView.findViewById(R.id.profile_manager_item_label);
+        TextView textView = (TextView) rowView.findViewById(R.id.profile_manager_item_text);
+        ImageView imageSelected = (ImageView) rowView.findViewById(R.id.profile_manager_item_activated);
+
+        ProfileListItem item = values.get(position);
+        textView.setText(item.label);
+        labelView.setText(item.text);
+
+        if(!item.activated){
+            RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams )textView.getLayoutParams();
+            lp.setMargins(0,0,0,0);
+
+            textView.setLayoutParams(lp);
+
+            imageSelected.setVisibility(View.GONE);
+        }
+
+        return rowView;
+    }
+}

+ 27 - 0
src/de/tudarmstadt/informatik/hostage/ui2/fragment/HomeFragment.java

@@ -0,0 +1,27 @@
+package de.tudarmstadt.informatik.hostage.ui2.fragment;
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import de.tudarmstadt.informatik.hostage.R;
+
+/**
+ * @author Alexander Brakowski
+ * @created 13.01.14 19:06
+ */
+
+public class HomeFragment extends Fragment {
+
+    public HomeFragment(){}
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        View rootView = inflater.inflate(R.layout.fragment_home, container, false);
+
+        return rootView;
+    }
+}

+ 87 - 0
src/de/tudarmstadt/informatik/hostage/ui2/fragment/HomeGLRenderer.java

@@ -0,0 +1,87 @@
+package de.tudarmstadt.informatik.hostage.ui2.fragment;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+import android.opengl.GLES20;
+import android.opengl.GLSurfaceView.Renderer;
+import android.opengl.Matrix;
+
+public class HomeGLRenderer implements Renderer {
+	public static int loadShader(int type, String source) {
+		int shader = GLES20.glCreateShader(type);
+		GLES20.glShaderSource(shader, source);
+		GLES20.glCompileShader(shader);
+		return shader;
+	}
+	
+	public static int loadProgram(String vertexSource, String fragmentSource) {
+		int program = GLES20.glCreateProgram();
+		GLES20.glAttachShader(program, loadShader(GLES20.GL_VERTEX_SHADER, vertexSource));
+		GLES20.glAttachShader(program, loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentSource));
+		GLES20.glLinkProgram(program);
+		return program;
+	}
+	
+	private int program;
+	private FloatBuffer vertexBuffer;
+	private float [] mvp;
+
+	public HomeGLRenderer() {}
+	
+	public void onSurfaceCreated(GL10 arg0, EGLConfig arg1) {
+		GLES20.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+
+		final float [] positions = {
+				0.0f, 0.5f, 0.0f, 1.0f,
+				0.5f, -0.5f, 0.0f, 1.0f,
+				-0.5f, -0.5f, 0.0f, 1.0f,
+		};
+		ByteBuffer bb = ByteBuffer.allocateDirect(4 * positions.length);
+		bb.order(ByteOrder.nativeOrder());
+		vertexBuffer = bb.asFloatBuffer();
+		vertexBuffer.put(positions);
+		vertexBuffer.position(0);
+		
+		mvp = new float[16];
+		Matrix.setIdentityM(mvp, 0);
+		
+		final String vertexSource =
+				"uniform mat4 mvp;" +
+				"attribute vec4 position;" +
+				"void main() {" +
+				"	gl_Position = mvp * position;" +
+				"}";
+		final String fragmentSource =
+				"precision mediump float;" +
+				"uniform vec4 color;" +
+				"void main() {" +
+				"	gl_FragColor = color;" +
+				"}";
+		program = loadProgram(vertexSource, fragmentSource);
+	}
+	
+	public void onDrawFrame(GL10 arg0) {
+		GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
+		GLES20.glUseProgram(program);
+		int positionAttribLoc = GLES20.glGetAttribLocation(program, "position");
+		int colorUniformLoc = GLES20.glGetUniformLocation(program, "color");
+		int mvpUniformLoc = GLES20.glGetUniformLocation(program, "mvp");
+		float [] color = {0.0f, 1.0f, 0.0f, 1.0f};
+		GLES20.glUniform4fv(colorUniformLoc, 1, color, 0);
+		Matrix.rotateM(mvp, 0, 4.0f, 0.0f, 0.0f, 1.0f);
+		GLES20.glUniformMatrix4fv(mvpUniformLoc, 1, false, mvp, 0);
+		GLES20.glEnableVertexAttribArray(positionAttribLoc);
+		GLES20.glVertexAttribPointer(positionAttribLoc, 4, GLES20.GL_FLOAT, false, 0, vertexBuffer);
+		GLES20.glDrawArrays(GLES20.GL_TRIANGLES, 0, 3);
+		GLES20.glDisableVertexAttribArray(positionAttribLoc);
+	}
+
+	public void onSurfaceChanged(GL10 arg0, int width, int height) {
+		GLES20.glViewport(0, 0, width, height);
+	}
+}

+ 24 - 0
src/de/tudarmstadt/informatik/hostage/ui2/fragment/HomeGLSurfaceView.java

@@ -0,0 +1,24 @@
+package de.tudarmstadt.informatik.hostage.ui2.fragment;
+
+import android.content.Context;
+import android.opengl.GLSurfaceView;
+import android.util.AttributeSet;
+import android.util.Log;
+
+public class HomeGLSurfaceView extends GLSurfaceView {
+
+	public HomeGLSurfaceView(Context context) {
+		super(context);
+		Log.d("gl", "constructor w/o attr");
+		// TODO Auto-generated constructor stub
+	}
+
+	public HomeGLSurfaceView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		Log.d("gl", "constructor attr");
+		setEGLContextClientVersion(2); // OpenGL ES 2.0
+        setRenderer(new HomeGLRenderer());
+		// TODO Auto-generated constructor stub
+	}
+
+}

+ 60 - 0
src/de/tudarmstadt/informatik/hostage/ui2/fragment/ProfileManagerFragment.java

@@ -0,0 +1,60 @@
+package de.tudarmstadt.informatik.hostage.ui2.fragment;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+
+import java.util.ArrayList;
+
+import de.tudarmstadt.informatik.hostage.R;
+import de.tudarmstadt.informatik.hostage.ui2.adapter.ProfileManagerListAdapter;
+import de.tudarmstadt.informatik.hostage.ui2.model.ProfileListItem;
+
+/**
+ * @author Alexander Brakowski
+ * @created 14.01.14 15:05
+ */
+public class ProfileManagerFragment extends Fragment {
+
+    public ProfileManagerFragment(){}
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        View rootView = inflater.inflate(R.layout.fragment_profile_manager, container, false);
+
+        ListView list = (ListView) rootView.findViewById(R.id.profile_manager_listview);
+
+        ArrayList<ProfileListItem> strList = new ArrayList<ProfileListItem>();
+
+        ProfileListItem nitem = new ProfileListItem(
+                "Test!!",
+                "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
+                R.drawable.ic_service_green);
+
+        nitem.activated = true;
+
+        strList.add(nitem);
+        strList.add(new ProfileListItem(
+                "Test1!",
+                "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
+                R.drawable.ic_service_green));
+        strList.add(new ProfileListItem(
+                "Test2!",
+                "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
+                R.drawable.ic_service_green));
+        strList.add(new ProfileListItem(
+                "Test3!",
+                "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
+                R.drawable.ic_service_green));
+
+        ProfileManagerListAdapter adapter = new ProfileManagerListAdapter(getActivity().getBaseContext(), strList);
+        list.setAdapter(adapter);
+
+        return rootView;
+    }
+}

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

@@ -0,0 +1,18 @@
+package de.tudarmstadt.informatik.hostage.ui2.model;
+
+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;
+    }
+}

+ 29 - 0
src/de/tudarmstadt/informatik/hostage/ui2/model/ProfileListItem.java

@@ -0,0 +1,29 @@
+package de.tudarmstadt.informatik.hostage.ui2.model;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity;
+
+/**
+ * @author Alexander Brakowski
+ * @created 14.01.14 18:04
+ */
+public class ProfileListItem {
+    public String label;
+    public String text;
+
+    public boolean activated;
+    public Bitmap icon;
+
+    public ProfileListItem(String text, String label, Bitmap icon){
+        this.text = text;
+        this.label = label;
+        this.activated = false;
+        this.icon = icon;
+    }
+
+    public ProfileListItem(String text, String label, int icon){
+        this(text, label, BitmapFactory.decodeResource(MainActivity.context.getResources(), icon));
+    }
+}

+ 0 - 5
target/classes/META-INF/MANIFEST.MF

@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Build-Jdk: 1.7.0_25
-Built-By: mip
-Created-By: Maven Integration for Eclipse
-

+ 0 - 7
target/classes/META-INF/maven/de.tudarmstadt.informatik/hostage/pom.properties

@@ -1,7 +0,0 @@
-#Generated by Maven Integration for Eclipse
-#Fri Nov 22 14:55:17 CET 2013
-version=2.0.0-SNAPSHOT
-groupId=de.tudarmstadt.informatik
-m2e.projectName=hostage
-m2e.projectLocation=/home/mip/workspace/hostage
-artifactId=hostage

+ 0 - 82
target/classes/META-INF/maven/de.tudarmstadt.informatik/hostage/pom.xml

@@ -1,82 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>de.tudarmstadt.informatik</groupId>
-	<artifactId>hostage</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>apk</packaging>
-	<name>HosTaGe</name>
-	<dependencies>
-		<dependency>
-			<groupId>android</groupId>
-			<artifactId>android</artifactId>
-			<version>4.4_r1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>android.support</groupId>
-			<artifactId>compatibility-v4</artifactId>
-			<version>19.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.roboguice</groupId>
-			<artifactId>roboguice</artifactId>
-			<version>2.0</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<finalName>${project.artifactId}</finalName>
-		<sourceDirectory>src</sourceDirectory>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-					<artifactId>android-maven-plugin</artifactId>
-					<version>3.8.0</version>
-					<extensions>true</extensions>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											com.jayway.maven.plugins.android.generation2
-										</groupId>
-										<artifactId>
-											android-maven-plugin
-										</artifactId>
-										<versionRange>
-											[3.8.0,)
-										</versionRange>
-										<goals>
-											<goal>consume-aar</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<configuration>
-					<sdk>
-						<platform>19</platform>
-					</sdk>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>

BIN
target/generated-sources/combined-assets/assets/p


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

@@ -1,5 +0,0 @@
-package de.tudarmstadt.informatik.hostage;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = true;
-}

+ 0 - 193
target/generated-sources/r/de/tudarmstadt/informatik/hostage/R.java

@@ -1,193 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package de.tudarmstadt.informatik.hostage;
-
-public final class R {
-    public static final class anim {
-        public static final int in_left_to_right=0x7f040000;
-        public static final int in_right_to_left=0x7f040001;
-        public static final int out_left_to_right=0x7f040002;
-        public static final int out_right_to_left=0x7f040003;
-    }
-    public static final class array {
-        public static final int delete_criteria=0x7f060001;
-        public static final int format=0x7f060000;
-        public static final int protocols=0x7f060002;
-    }
-    public static final class attr {
-    }
-    public static final class color {
-        public static final int dark_grey=0x7f070001;
-        public static final int light_grey=0x7f070000;
-    }
-    public static final class dimen {
-        /**  Default screen margins, per the Android Design guidelines. 
-
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-    
-         */
-        public static final int activity_horizontal_margin=0x7f080000;
-        public static final int activity_vertical_margin=0x7f080001;
-    }
-    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 class id {
-        public static final int TextViewServices=0x7f0c0019;
-        public static final int action_about=0x7f0c0029;
-        public static final int action_settings=0x7f0c0028;
-        public static final int buttonDeleteLog=0x7f0c0024;
-        public static final int buttonExportDatabase=0x7f0c0022;
-        public static final int buttonShowLog=0x7f0c000f;
-        public static final int buttonUploadLog=0x7f0c0023;
-        public static final int checkBoxParanoid=0x7f0c000d;
-        public static final int imageViewLight=0x7f0c000c;
-        public static final int layoutContainer=0x7f0c001c;
-        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=0x7f0c001a;
-        public static final int textFirstAttack=0x7f0c001d;
-        public static final int textFirstAttackValue=0x7f0c001e;
-        public static final int textLastAttack=0x7f0c001f;
-        public static final int textLastAttackValue=0x7f0c0020;
-        public static final int textLogFile=0x7f0c0021;
-        public static final int textStatistics=0x7f0c001b;
-        public static final int textViewBSSID=0x7f0c0013;
-        public static final int textViewBSSIDValue=0x7f0c0014;
-        public static final int textViewConnections=0x7f0c0026;
-        public static final int textViewConnectionsValue=0x7f0c0027;
-        public static final int textViewDetails=0x7f0c0010;
-        public static final int textViewExternalIP=0x7f0c0017;
-        public static final int textViewExternalIPValue=0x7f0c0018;
-        public static final int textViewInternalIP=0x7f0c0015;
-        public static final int textViewInternalIPValue=0x7f0c0016;
-        public static final int textViewProtocol=0x7f0c0025;
-        public static final int textViewSSID=0x7f0c0011;
-        public static final int textViewSSIDValue=0x7f0c0012;
-        public static final int textViewStatus=0x7f0c000b;
-        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=0x7f0c000e;
-        public static final int version=0x7f0c0001;
-        public static final int viewAnimator=0x7f0c000a;
-    }
-    public static final class layout {
-        public static final int activity_about=0x7f030000;
-        public static final int activity_main=0x7f030001;
-        public static final int activity_viewlog=0x7f030002;
-        public static final int list_view_protocols_row=0x7f030003;
-    }
-    public static final class menu {
-        public static final int main=0x7f0b0000;
-    }
-    public static final class string {
-        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=0x7f09001f;
-        public static final int authors_l=0x7f090021;
-        public static final int authors_m=0x7f090020;
-        public static final int authors_w=0x7f090022;
-        public static final int bssid=0x7f090009;
-        public static final int cancel=0x7f090015;
-        public static final int capital_off=0x7f090004;
-        public static final int capital_on=0x7f090003;
-        public static final int clear=0x7f090013;
-        public static final int connections=0x7f09000d;
-        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=0x7f09001b;
-        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 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=0x7f09001d;
-        public static final int link_tracing=0x7f09001e;
-        public static final int link_website=0x7f09001c;
-        public static final int log_actions=0x7f090010;
-        public static final int paranoid=0x7f090006;
-        public static final int pref_alarm=0x7f090024;
-        public static final int pref_alarm_default=0x7f090025;
-        public static final int pref_alarm_summ=0x7f090026;
-        public static final int pref_connection_settings=0x7f090036;
-        public static final int pref_external_location_title=0x7f09002a;
-        public static final int pref_external_storage_summ=0x7f090029;
-        public static final int pref_external_storage_title=0x7f090028;
-        public static final int pref_max_connections=0x7f090030;
-        public static final int pref_max_connections_default=0x7f090031;
-        public static final int pref_notification=0x7f09002b;
-        public static final int pref_sleeptime=0x7f090034;
-        public static final int pref_sleeptime_default=0x7f090035;
-        public static final int pref_storage=0x7f090027;
-        public static final int pref_timeout=0x7f090032;
-        public static final int pref_timeout_default=0x7f090033;
-        public static final int pref_upload=0x7f09002e;
-        public static final int pref_upload_server=0x7f09002f;
-        public static final int pref_vibration=0x7f09002c;
-        public static final int pref_vibration_summ=0x7f09002d;
-        public static final int services=0x7f09000c;
-        public static final int settings=0x7f090023;
-        public static final int ssid=0x7f090008;
-        public static final int statistics=0x7f09000e;
-        public static final int status=0x7f090005;
-        public static final int text_version=0x7f09001a;
-    }
-    public static final class style {
-        /** 
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    
-
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        
-
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    
- API 11 theme customizations can go here. 
-
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    
- API 14 theme customizations can go here. 
-         */
-        public static final int AppBaseTheme=0x7f0a0000;
-        /**  Application theme. 
- All customizations that are NOT specific to a particular API-level can go here. 
-         */
-        public static final int AppTheme=0x7f0a0001;
-    }
-    public static final class xml {
-        public static final int preferences=0x7f050000;
-    }
-}

BIN
target/hostage.jar


+ 0 - 5
target/maven-archiver/pom.properties

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Fri Nov 22 16:32:37 CET 2013
-version=2.0.0-SNAPSHOT
-groupId=de.tudarmstadt.informatik
-artifactId=hostage

+ 0 - 86
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,86 +0,0 @@
-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/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/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/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/ui/ViewLog$7.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/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/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/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

+ 0 - 42
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,42 +0,0 @@
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ui/ListViewAdapter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/TELNET.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/handler/StringHandler.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/format/TELNETFormatter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ui/ViewLogTable.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/net/MySSLSocketFactory.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/logging/DatabaseHandler.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/net/MyServerSocketFactory.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/io/ByteArrayReaderWriter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/ECHO.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/io/ReaderWriter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/SSLProtocol.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/format/LogViewFormatter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/HTTPS.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/wrapper/ByteArray.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/commons/HelperUtils.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/FTP.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/SSH.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/format/ProtocolFormatter.java
-/home/mip/workspace/hostage/target/generated-sources/r/de/tudarmstadt/informatik/hostage/BuildConfig.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/SMB.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/HoneyService.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/format/MySQLFormatter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/HoneyListener.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/io/StringReaderWriter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ui/SettingsActivity.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/MySQL.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/format/DefaultFormatter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/logging/SQLLogger.java
-/home/mip/workspace/hostage/target/generated-sources/r/de/tudarmstadt/informatik/hostage/R.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/Protocol.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/handler/ByteArrayHandler.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/system/PrivilegedPort.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ui/MainActivity.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ui/AboutActivity.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/logging/Record.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ui/ViewLog.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/format/SMBFormatter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ConnectionRegister.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/logging/Logger.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/HTTP.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/handler/AbstractHandler.java