Browse Source

preperations for release build and cleanup

Fabio Arnold 10 years ago
parent
commit
179924fbd4
43 changed files with 156 additions and 2108 deletions
  1. 0 27
      AndroidManifest.xml
  2. 20 7
      build.gradle
  3. 0 3
      res/layout-land/fragment_statistics.xml
  4. 0 94
      res/layout/activity_about.xml
  5. 0 15
      res/layout/activity_loglist.xml
  6. 0 189
      res/layout/activity_main.xml
  7. 0 52
      res/layout/activity_playground.xml
  8. 0 17
      res/layout/activity_sync_central.xml
  9. 0 127
      res/layout/activity_viewlog.xml
  10. 0 4
      res/layout/fragment_connectioninfo_dialog.xml
  11. 0 3
      res/layout/fragment_home.xml
  12. 119 169
      res/layout/fragment_record_detail.xml
  13. 0 154
      res/layout/fragment_record_overview.xml
  14. 0 3
      res/layout/fragment_services.xml
  15. 0 3
      res/layout/fragment_statistics.xml
  16. 0 1
      res/layout/fragment_threatmap_infowindow.xml
  17. 0 45
      res/layout/list_view_protocols_row.xml
  18. 0 25
      res/layout/loglist_row.xml
  19. 0 3
      res/layout/plot_list_item.xml
  20. 2 0
      res/layout/preference_warning.xml
  21. 0 12
      res/layout/preferences_image_widget.xml
  22. 0 35
      res/layout/profile_manager_list_item.xml
  23. 0 4
      res/layout/record_list_item.xml
  24. 0 1
      res/layout/services_list_item.xml
  25. 0 1
      res/layout/simple_popup_item.xml
  26. 0 1
      res/layout/simple_popup_table.xml
  27. 0 4
      res/layout/split_popup_item.xml
  28. 0 15
      res/menu/main.xml
  29. 7 0
      res/values-de/strings_gui.xml
  30. 2 0
      res/values-de/strings_preferences.xml
  31. 0 0
      res/values/broadcast.xml
  32. 0 0
      res/values/connection_info.xml
  33. 0 14
      res/values/strings_about.xml
  34. 0 28
      res/values/strings_gui.xml
  35. 0 35
      src/de/tudarmstadt/informatik/hostage/ui/AboutActivity.java
  36. 0 66
      src/de/tudarmstadt/informatik/hostage/ui/ListViewAdapter.java
  37. 0 610
      src/de/tudarmstadt/informatik/hostage/ui/MainActivity.java
  38. 0 107
      src/de/tudarmstadt/informatik/hostage/ui/PlayGroundActivity.java
  39. 0 194
      src/de/tudarmstadt/informatik/hostage/ui/SettingsActivity.java
  40. 0 37
      src/de/tudarmstadt/informatik/hostage/ui/ViewLogTable.java
  41. 4 1
      src/de/tudarmstadt/informatik/hostage/ui2/adapter/ServicesListAdapter.java
  42. 1 1
      src/de/tudarmstadt/informatik/hostage/ui2/fragment/RecordDetailFragment.java
  43. 1 1
      src/de/tudarmstadt/informatik/hostage/ui2/fragment/opengl/AnimatedMesh.java

+ 0 - 27
AndroidManifest.xml

@@ -55,37 +55,10 @@
   
         </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" >
-        </activity>
-        <activity
-            android:name="de.tudarmstadt.informatik.hostage.ui.ViewLogTable"
-            android:label="@string/database" >
-        </activity>
         <activity
             android:name=".ui2.activity.ProfileEditActivity"
             android:label="Edit Profile" >
         </activity>
-        <activity
-            android:name="de.tudarmstadt.informatik.hostage.ui.SettingsActivity"
-            android:label="@string/settings" >
-        </activity>
-        <activity
-            android:name="de.tudarmstadt.informatik.hostage.ui.AboutActivity"
-            android:label="@string/gui_action_about" >
-        </activity>
-        <activity
-            android:name="de.tudarmstadt.informatik.hostage.ui.PlayGroundActivity"
-            android:label="@string/gui_playground" >
-        </activity>
 
         <activity
             android:name="de.tudarmstadt.informatik.hostage.sync.tracing.TracingSyncActivity"

+ 20 - 7
build.gradle

@@ -54,9 +54,16 @@ android {
         release.setRoot('build-types/release')
     }
 
-    signingConfigs {
-        release {
-            storeFile file("release.keystore")
+    // signing for release only works in the console
+    boolean doSigningForRelease = System.console() != null
+    if (doSigningForRelease) {
+        signingConfigs {
+            release {
+                storeFile file(System.console().readLine("\n\$ Enter keystore path: "))
+                storePassword System.console().readLine("\n\$ Enter keystore password: ")
+                keyAlias System.console().readLine("\n\$ Enter key alias: ")
+                keyPassword System.console().readLine("\n\$ Enter key password: ")
+            }
         }
     }
 
@@ -66,10 +73,16 @@ android {
             jniDebugBuild true
         }
 
-        release {
-            debuggable false
-            jniDebugBuild false
-            signingConfig signingConfigs.release
+        if (doSigningForRelease) {
+            release {
+                debuggable false
+                jniDebugBuild false
+                signingConfig signingConfigs.release
+            }
         }
     }
+
+    lintOptions {
+        abortOnError false
+    }
 }

+ 0 - 3
res/layout-land/fragment_statistics.xml

@@ -48,7 +48,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:text="Title"
                     android:textAlignment="center"
                     android:id="@+id/title_text_view" />
             </LinearLayout>
@@ -88,7 +87,6 @@
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:text="table header title"
                     android:id="@+id/table_header_title_textview"
                     android:gravity="bottom|left"
                     android:textAlignment="viewStart"
@@ -99,7 +97,6 @@
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:text="value"
                     android:id="@+id/table_header_value_textview"
                     android:textAlignment="viewEnd"
                     android:layout_weight="0.6"

+ 0 - 94
res/layout/activity_about.xml

@@ -1,94 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
-        
-        <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <TextView
-            android:id="@+id/text_version"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/text_version" />
-        
-        <TextView
-            android:id="@+id/version"
-            android:paddingLeft="2dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="" />
-        
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/text_description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:text="@string/description" />
-        
-        <TextView
-            android:id="@+id/link_website"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:text="@string/link_website" />
-        
-        <TextView
-            android:id="@+id/link_github"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:text="@string/link_github" />
-        
-		<TextView
-            android:id="@+id/link_tracing"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:text="@string/link_tracing" />
-
-        <TextView
-            android:id="@+id/text_authors"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-	 		android:paddingTop="@dimen/activity_vertical_margin"
-            android:text="@string/authors" />
-
-        <TextView
-            android:id="@+id/text_author_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/authors_m" />
-               
-        <TextView
-            android:id="@+id/text_author_2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/authors_w" />
-                
-         <TextView
-            android:id="@+id/text_author_3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/authors_l" />
-
-    </LinearLayout>
-    
-</LinearLayout>

+ 0 - 15
res/layout/activity_loglist.xml

@@ -1,15 +0,0 @@
-<?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="match_parent" >
-
-    <ListView
-        android:id="@+id/loglistview"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true" >
-
-    </ListView>
-
-</RelativeLayout>

+ 0 - 189
res/layout/activity_main.xml

@@ -1,189 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".MainActivity" >
-
-    <ViewAnimator
-        android:id="@+id/viewAnimator"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" >
-
-            <TextView
-                android:id="@+id/textViewStatus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_above="@+id/imageViewLight"
-                android:layout_centerHorizontal="true"
-                android:text="@string/gui_status"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <ImageView
-                android:id="@+id/imageViewLight"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                android:src="@drawable/light_grey_large" />
-
-            <CheckBox
-                android:id="@+id/checkBoxParanoid"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentLeft="true"
-                android:text="@string/gui_paranoid" />
-
-            <ToggleButton
-                android:id="@+id/toggleButtonOnOff"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentRight="true"
-                android:onClick="buttonOnOffClick"
-                android:textOff="@string/gui_capital_off"
-                android:textOn="@string/gui_capital_on" />
-
-            <Button
-                android:id="@+id/buttonShowLog"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
-                android:onClick="showLog"
-                android:text="Show Log" />
-
-            <Button
-                android:id="@+id/buttonPlayGround"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_toRightOf="@+id/buttonShowLog"
-                android:onClick="startPlayGround"
-                android:text="PlayGround" />
-
-        </RelativeLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/textViewDetails"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/gui_details"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/textViewSSID"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="20dp"
-                    android:text="@string/gui_ssid"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <TextView
-                    android:id="@+id/textViewSSIDValue"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="5dp"
-                    android:text="-"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/textViewBSSID"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="20dp"
-                    android:text="@string/gui_bssid"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <TextView
-                    android:id="@+id/textViewBSSIDValue"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="5dp"
-                    android:text="-"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/textViewInternalIP"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="20dp"
-                    android:text="@string/gui_internal_ip"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <TextView
-                    android:id="@+id/textViewInternalIPValue"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="5dp"
-                    android:text="-"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-            </LinearLayout>
-            
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:id="@+id/textViewExternalIP"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="20dp"
-                    android:text="@string/gui_external_ip"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <TextView
-                    android:id="@+id/textViewExternalIPValue"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="5dp"
-                    android:text="-"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/TextViewServices"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/gui_services"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <ListView
-                android:id="@+id/listViewProtocols"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:divider="#b5b5b5"
-                android:dividerHeight="1dp"
-                android:entries="@array/protocols" >
-            </ListView>
-        </LinearLayout>
-    </ViewAnimator>
-
-</RelativeLayout>

+ 0 - 52
res/layout/activity_playground.xml

@@ -1,52 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <Button
-            android:id="@+id/buttonSyncServer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:onClick="syncData"
-            android:text="Sync Data" />
-        
-        <Button
-            android:id="@+id/buttonStartNFC"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:onClick="startNFC"
-            android:text="start NFC" />
-
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/buttonCreateNetwork"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:onClick="createNetworkData"
-        android:text="Create Network Data" />
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <TextView
-            android:id="@+id/textView1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="TextView" />
-         
-    </ScrollView>
-
-</LinearLayout>

+ 0 - 17
res/layout/activity_sync_central.xml

@@ -1,17 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin" >
-
-    <TextView
-        android:id="@+id/sync_central_text_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Uploading Records to" />
-
-</LinearLayout>

+ 0 - 127
res/layout/activity_viewlog.xml

@@ -1,127 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-	android:scrollbars="none">
-
-   <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="@dimen/activity_vertical_margin"
-    	android:paddingLeft="@dimen/activity_horizontal_margin"
-    	android:paddingRight="@dimen/activity_horizontal_margin"
-    	android:paddingTop="@dimen/activity_vertical_margin" >
-
-        <TextView
-            android:id="@+id/textStatistics"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/gui_statistics"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <TableLayout
-            android:id="@+id/layoutContainer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-        </TableLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" >
-
-            <TextView
-                android:id="@+id/textFirstAttack"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/gui_firstAttack"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <TextView
-                android:id="@+id/textFirstAttackValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="2dp"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" >
-
-            <TextView
-                android:id="@+id/textLastAttack"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/gui_lastAttack"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <TextView
-                android:id="@+id/textLastAttackValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="2dp"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/textLogFile"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/gui_log_actions"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" >
-
-            <Button
-                android:id="@+id/buttonShowLog"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="showLog"
-                android:text="Show Log" />
-
-            <Button
-                android:id="@+id/buttonExportDatabase"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="exportDatabase"
-                android:text="Export Database" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" >
-
-            <Button
-                android:id="@+id/buttonUploadLog"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="uploadDatabase"
-                android:text="Upload Log" />
-
-            <Button
-                android:id="@+id/buttonDeleteLog"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="deleteLog"
-                android:text="Delete Log" />
-        </LinearLayout>
-    </LinearLayout>
-
-        <TableLayout
-            android:id="@+id/attack_info"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="vertical" >
-        </TableLayout>
-
-</RelativeLayout>

+ 0 - 4
res/layout/fragment_connectioninfo_dialog.xml

@@ -24,7 +24,6 @@
 					android:layout_width="fill_parent"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="undefined"
 					android:id="@+id/connectioninfo_ssid_value" android:layout_column="1"
 					android:layout_margin="4dp" android:gravity="right"/>
 		</TableRow>
@@ -43,7 +42,6 @@
 					android:layout_width="fill_parent"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="undefined"
 					android:id="@+id/connectioninfo_bssid_value" android:layout_column="1"
 					android:layout_margin="4dp" android:gravity="right"/>
 		</TableRow>
@@ -62,7 +60,6 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="undefined"
 					android:id="@+id/connectioninfo_internalip_value" android:layout_column="1"
 					android:layout_margin="4dp" android:gravity="right"/>
 		</TableRow>
@@ -81,7 +78,6 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="undefined"
 					android:id="@+id/connectioninfo_externalip_value" android:layout_column="1"
 					android:layout_margin="4dp" android:gravity="right"/>
 		</TableRow>

+ 0 - 3
res/layout/fragment_home.xml

@@ -83,7 +83,6 @@
                 android:layout_centerHorizontal="true"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="21dp"
-                android:text="Eduroam"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:textSize="26sp" />
 
@@ -113,7 +112,6 @@
             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" />
 
@@ -139,7 +137,6 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/home_text_profile_header"
                 android:layout_centerHorizontal="true"
-                android:text="Windows 7"
                 android:textSize="11sp" />
 	        <ImageView
 			        android:layout_width="wrap_content"

+ 119 - 169
res/layout/fragment_record_detail.xml

@@ -1,200 +1,150 @@
 <?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:padding="16dp" android:background="@android:color/transparent">
-
-	<TableLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content" android:stretchColumns="*">
-		<TableRow
-				android:layout_width="match_parent"
-				android:layout_height="match_parent">
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="@string/ssid"
-					android:id="@+id/textView2"/>
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="undefined"
-					android:id="@+id/record_detail_ssid_value" android:layout_column="1"
-					/>
-		</TableRow>
-		<TableRow
-				android:layout_width="match_parent"
-				android:layout_height="match_parent">
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="@string/bssid"
-					android:id="@+id/record_details_text_ssid" android:layout_column="0"/>
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="undefined"
-					android:id="@+id/record_detail_bssid_value"
-					/>
-		</TableRow>
-		<TableRow
-				android:layout_width="match_parent"
-				android:layout_height="match_parent">
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="@string/protocol"
-					android:id="@+id/textView3" android:layout_column="0"/>
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="undefined"
-					android:id="@+id/record_detail_protocol_value"
-					/>
-		</TableRow>
-		<TableRow
-				android:layout_width="match_parent"
-				android:layout_height="match_parent">
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="@string/timestamp"
-					android:id="@+id/record_details_text_bssid" android:layout_column="0"/>
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="undefined"
-					android:id="@+id/record_detail_timestamp_value"
-					/>
-		</TableRow>
-		<TableRow
-				android:layout_width="match_parent"
-				android:layout_height="match_parent">
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="@string/location"
-					android:id="@+id/textView5" android:layout_column="0"/>
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="undefined"
-					android:id="@+id/record_detail_location_value"
-					/>
-		</TableRow>
-		<TableRow
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/scrollView"
+            android:fillViewport="true">
+
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+				  android:orientation="vertical"
+				  android:layout_width="match_parent"
+				  android:layout_height="wrap_content"
+				  android:measureWithLargestChild="false"
+				  android:baselineAligned="true"
+				  android:id="@+id/linearLayout3">
+
+		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+					  android:orientation="vertical"
+					  android:layout_width="match_parent"
+					  android:layout_height="wrap_content"
+					  android:measureWithLargestChild="false"
+					  android:baselineAligned="true"
+					  android:id="@+id/record_overview_conversation">
+
+		<RelativeLayout
 				android:layout_width="match_parent"
-				android:layout_height="match_parent">
+				android:layout_height="wrap_content"
+				android:background="@drawable/panel_bg_selector"
+				android:layout_margin="5dp"
+				android:paddingBottom="10dp"
+				android:paddingLeft="10dp"
+				android:paddingTop="5dp"
+				android:paddingRight="10dp"
+				>
+
 			<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="@string/internal_ip"
-					android:id="@+id/textView7" android:layout_column="0"/>
+					android:id="@+id/record_details_text_ssid"
+					android:layout_toRightOf="@+id/textView7"
+					android:layout_marginLeft="27dp"/>
+
 			<TextView
 					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="undefined"
-					android:id="@+id/record_detail_internalip_value"
-					/>
-		</TableRow>
-		<TableRow
-				android:layout_width="match_parent"
-				android:layout_height="match_parent">
+					android:layout_height="match_parent"
+					android:textAppearance="?android:attr/textAppearanceSmall"
+					android:text="@string/RecordSSID"
+					android:textAllCaps="true"
+					android:id="@+id/textView2"
+					android:gravity="center"
+					android:layout_alignParentTop="true"
+					android:layout_alignParentLeft="true"
+					android:layout_alignParentStart="true"
+					android:layout_alignBottom="@+id/record_details_text_ssid"/>
+
 			<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="@string/external_ip"
-					android:id="@+id/record_details_text_protocol" android:layout_column="0"/>
+					android:textAppearance="?android:attr/textAppearanceSmall"
+					android:text="@string/RecordBSSID"
+					android:textAllCaps="true"
+					android:id="@+id/textView3"
+					android:layout_alignTop="@+id/record_details_text_bssid"
+					android:layout_alignParentLeft="true"
+					android:layout_alignParentStart="true"
+					android:layout_alignBottom="@+id/record_details_text_bssid"
+					android:gravity="center"/>
+
 			<TextView
+					android:id="@+id/record_details_text_bssid"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="undefined"
-					android:id="@+id/record_detail_externalip_value"
-					/>
-		</TableRow>
-		<TableRow
-				android:layout_width="match_parent"
-				android:layout_height="match_parent">
+					android:layout_below="@+id/record_details_text_ssid"
+					android:layout_alignLeft="@+id/record_details_text_ssid"
+					android:layout_alignStart="@+id/record_details_text_ssid"/>
+
 			<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="@string/remote_ip"
-					android:id="@+id/record_details_text_protocol" android:layout_column="0"/>
+					android:textAppearance="?android:attr/textAppearanceSmall"
+					android:text="@string/record_details_remote_ip"
+					android:textAllCaps="true"
+					android:id="@+id/textView7"
+					android:gravity="center"
+					android:layout_alignTop="@+id/record_details_text_remoteip"
+					android:layout_alignBottom="@+id/record_details_text_remoteip"/>
+
 			<TextView
+					android:id="@+id/record_details_text_remoteip"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="undefined"
-					android:id="@+id/record_detail_remoteip_value"
-					/>
-		</TableRow>
-		<TableRow
-				android:layout_width="match_parent"
-				android:layout_height="match_parent">
+					android:layout_alignLeft="@+id/record_details_text_bssid"
+					android:layout_alignStart="@+id/record_details_text_bssid"
+					android:layout_below="@+id/record_details_text_bssid"
+					android:layout_alignParentRight="true"
+					android:layout_alignParentEnd="true"/>
+
 			<TextView
 					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="@string/packet_type"
-					android:id="@+id/record_details_text_remoteip" android:layout_column="0"/>
+					android:layout_height="match_parent"
+					android:textAppearance="?android:attr/textAppearanceSmall"
+					android:text="@string/RecordProtocol"
+					android:id="@+id/textView5"
+					android:textAllCaps="true"
+					android:layout_gravity="right|center"
+					android:textAlignment="gravity"
+					android:gravity="center_vertical"
+					android:layout_alignTop="@+id/record_details_text_protocol"
+					android:layout_alignParentLeft="true"
+					android:layout_alignParentStart="true"
+					android:layout_alignBottom="@+id/record_details_text_protocol"/>
+
 			<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="undefined"
-					android:id="@+id/record_detail_packettype_value"
-					/>
-		</TableRow>
-	</TableLayout>
-	<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:text="@string/packet_content"
-			android:id="@+id/textView9"/>
-	<ScrollView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:id="@+id/scrollView"
-			android:layout_weight="1" android:fillViewport="true"
-			android:background="@drawable/panel_bg">
+					android:textAllCaps="true"
+					android:id="@+id/record_details_text_protocol"
+					android:gravity="center_horizontal"
+					android:layout_below="@+id/record_details_text_remoteip"
+					android:layout_alignLeft="@+id/record_details_text_remoteip"
+					android:layout_alignStart="@+id/record_details_text_remoteip"/>
+
+		</RelativeLayout>
+
 		<TextView
-				android:layout_width="match_parent"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:padding="8dp"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:text="undefined"
-				android:id="@+id/record_conversation_content" android:autoText="false"
-				android:typeface="monospace"
-				android:singleLine="false"
-				android:textIsSelectable="true"
-				/>
-	</ScrollView>
-
-	<Button
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/delete"
-			android:id="@+id/button"
-			android:layout_gravity="center_horizontal|bottom"
-			android:layout_weight="0" android:layout_marginTop="8dp"
-			android:background="@color/holo_red"
-			android:textColor="@android:color/white"/>
-</LinearLayout>
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:text="@string/record_details_conversation"
+				android:textAllCaps="true"
+				android:id="@+id/textView9"
+				android:layout_marginLeft="10dp"
+				android:layout_marginTop="10dp"
+				android:layout_marginBottom="20dp"/>
+
+	</LinearLayout>
+
+
+		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
+				android:text="@string/delete" android:id="@+id/record_delete_button"
+				android:layout_gravity="center_horizontal" android:layout_weight="0"
+				android:layout_margin="8dp" android:background="@color/holo_red"
+				android:textColor="@android:color/white"/>
+
+	</LinearLayout>
+</ScrollView>

+ 0 - 154
res/layout/fragment_record_overview.xml

@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/scrollView"
-            android:fillViewport="true">
-
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				  android:orientation="vertical"
-				  android:layout_width="match_parent"
-				  android:layout_height="wrap_content"
-				  android:measureWithLargestChild="false"
-				  android:baselineAligned="true"
-				  android:id="@+id/linearLayout3">
-
-		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-					  android:orientation="vertical"
-					  android:layout_width="match_parent"
-					  android:layout_height="wrap_content"
-					  android:measureWithLargestChild="false"
-					  android:baselineAligned="true"
-					  android:id="@+id/record_overview_conversation">
-
-		<RelativeLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:background="@drawable/panel_bg_selector"
-				android:layout_margin="5dp"
-				android:paddingBottom="10dp"
-				android:paddingLeft="10dp"
-				android:paddingTop="5dp"
-				android:paddingRight="10dp"
-				>
-
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="-"
-					android:id="@+id/record_details_text_ssid"
-					android:layout_toRightOf="@+id/textView7"
-					android:layout_marginLeft="27dp"/>
-
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:text="@string/RecordSSID"
-					android:textAllCaps="true"
-					android:id="@+id/textView2"
-					android:gravity="center"
-					android:layout_alignParentTop="true"
-					android:layout_alignParentLeft="true"
-					android:layout_alignParentStart="true"
-					android:layout_alignBottom="@+id/record_details_text_ssid"/>
-
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:text="@string/RecordBSSID"
-					android:textAllCaps="true"
-					android:id="@+id/textView3"
-					android:layout_alignTop="@+id/record_details_text_bssid"
-					android:layout_alignParentLeft="true"
-					android:layout_alignParentStart="true"
-					android:layout_alignBottom="@+id/record_details_text_bssid"
-					android:gravity="center"/>
-
-			<TextView
-					android:id="@+id/record_details_text_bssid"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="-"
-					android:layout_below="@+id/record_details_text_ssid"
-					android:layout_alignLeft="@+id/record_details_text_ssid"
-					android:layout_alignStart="@+id/record_details_text_ssid"/>
-
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:text="@string/record_details_remote_ip"
-					android:textAllCaps="true"
-					android:id="@+id/textView7"
-					android:gravity="center"
-					android:layout_alignTop="@+id/record_details_text_remoteip"
-					android:layout_alignBottom="@+id/record_details_text_remoteip"/>
-
-			<TextView
-					android:id="@+id/record_details_text_remoteip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="-"
-					android:layout_alignLeft="@+id/record_details_text_bssid"
-					android:layout_alignStart="@+id/record_details_text_bssid"
-					android:layout_below="@+id/record_details_text_bssid"
-					android:layout_alignParentRight="true"
-					android:layout_alignParentEnd="true"/>
-
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:text="@string/RecordProtocol"
-					android:id="@+id/textView5"
-					android:textAllCaps="true"
-					android:layout_gravity="right|center"
-					android:textAlignment="gravity"
-					android:gravity="center_vertical"
-					android:layout_alignTop="@+id/record_details_text_protocol"
-					android:layout_alignParentLeft="true"
-					android:layout_alignParentStart="true"
-					android:layout_alignBottom="@+id/record_details_text_protocol"/>
-
-			<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceMedium"
-					android:text="-"
-					android:textAllCaps="true"
-					android:id="@+id/record_details_text_protocol"
-					android:gravity="center_horizontal"
-					android:layout_below="@+id/record_details_text_remoteip"
-					android:layout_alignLeft="@+id/record_details_text_remoteip"
-					android:layout_alignStart="@+id/record_details_text_remoteip"/>
-
-		</RelativeLayout>
-
-		<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:text="@string/record_details_conversation"
-				android:textAllCaps="true"
-				android:id="@+id/textView9"
-				android:layout_marginLeft="10dp"
-				android:layout_marginTop="10dp"
-				android:layout_marginBottom="20dp"/>
-
-	</LinearLayout>
-
-
-		<Button android:layout_width="wrap_content" android:layout_height="wrap_content"
-				android:text="@string/delete" android:id="@+id/record_delete_button"
-				android:layout_gravity="center_horizontal" android:layout_weight="0"
-				android:layout_margin="8dp" android:background="@color/holo_red"
-				android:textColor="@android:color/white"/>
-
-	</LinearLayout>
-</ScrollView>

+ 0 - 3
res/layout/fragment_services.xml

@@ -9,7 +9,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <TextView
-                android:id="@+id/record_details_text_ssid"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
@@ -52,7 +51,6 @@
                 android:layout_centerHorizontal="true"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="21dp"
-                android:text="Eduroam"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:textSize="26sp" />
 
@@ -66,7 +64,6 @@
             android:weightSum="1" >
 
         <TextView
-                android:id="@+id/record_details_text_ssid"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"

+ 0 - 3
res/layout/fragment_statistics.xml

@@ -45,7 +45,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="Title"
                         android:textAlignment="center"
                         android:id="@+id/title_text_view" />
                 </LinearLayout>
@@ -85,7 +84,6 @@
                         android:layout_width="fill_parent"
                         android:layout_height="fill_parent"
                         android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:text="table header title"
                         android:id="@+id/table_header_title_textview"
                         android:gravity="bottom|left"
                         android:textAlignment="viewStart"
@@ -96,7 +94,6 @@
                         android:layout_width="fill_parent"
                         android:layout_height="fill_parent"
                         android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:text="value"
                         android:id="@+id/table_header_value_textview"
                         android:textAlignment="viewEnd"
                         android:layout_weight="0.6"

+ 0 - 1
res/layout/fragment_threatmap_infowindow.xml

@@ -9,7 +9,6 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:text="undefined"
 			android:id="@+id/threatmap_infowindow_title" android:layout_gravity="center_horizontal"/>
 	<TextView
 			android:layout_width="wrap_content"

+ 0 - 45
res/layout/list_view_protocols_row.xml

@@ -1,45 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="5dp" >
-
-    <ImageView
-        android:id="@+id/imageViewLight"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_toRightOf="@+id/imageViewLight"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/textViewProtocol"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" >
-
-            <TextView
-                android:id="@+id/textViewConnections"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/gui_connections"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <TextView
-                android:id="@+id/textViewConnectionsValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="5dp"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-        </LinearLayout>
-    </LinearLayout>
-
-</RelativeLayout>

+ 0 - 25
res/layout/loglist_row.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:id="@+id/profile_manager_root_view">
-
-    <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"
-        android:layout_alignParentLeft="true"
-        android:layout_marginLeft="0dp"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="0dp" />
-
-</RelativeLayout>

+ 0 - 3
res/layout/plot_list_item.xml

@@ -16,7 +16,6 @@
         android:layout_width="fill_parent"
         android:layout_height="match_parent"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text=" "
         android:id="@+id/color_view"
         android:layout_weight="4"
         />
@@ -25,7 +24,6 @@
         android:layout_width="fill_parent"
         android:layout_height="match_parent"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="title"
         android:id="@+id/title_text_view"
         android:layout_weight="3"
         android:paddingLeft="5dp"
@@ -36,7 +34,6 @@
         android:layout_width="fill_parent"
         android:layout_height="match_parent"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="value"
         android:id="@+id/value_text_view"
         android:textAlignment="textEnd"
         android:gravity="right"

+ 2 - 0
res/layout/preference_warning.xml

@@ -21,6 +21,7 @@
 			android:layout_marginBottom="6dip"
 			android:layout_weight="1">
 
+		<!--suppress AndroidDomInspection -->
 		<TextView android:id="@+android:id/title"
 		          android:layout_width="wrap_content"
 		          android:layout_height="wrap_content"
@@ -29,6 +30,7 @@
 		          android:ellipsize="marquee"
 		          android:fadingEdge="horizontal" />
 
+		<!--suppress AndroidDomInspection -->
 		<TextView android:id="@+android:id/summary"
 		          android:layout_width="wrap_content"
 		          android:layout_height="wrap_content"

+ 0 - 12
res/layout/preferences_image_widget.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-	<ImageView
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:id="@+id/preference_image" android:layout_gravity="center_horizontal"/>
-</LinearLayout>

+ 0 - 35
res/layout/profile_manager_list_item.xml

@@ -26,7 +26,6 @@
             <ImageButton
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:text="Edit"
                 android:id="@+id/profile_manager_item_button_edit"
                 android:layout_weight="1"
                 style="@android:style/DeviceDefault.Light.ButtonBar"
@@ -45,7 +44,6 @@
             <ImageButton
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:text="Delete"
                 android:id="@+id/profile_manager_item_button_delete"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentRight="true"
@@ -76,14 +74,12 @@
 	        android:paddingRight="16dp"
 	        android:textColor="?android:attr/colorForeground"
 	        android:minHeight="?android:attr/listPreferredItemHeightSmall"
-	        android:text="Sample title"
 	        android:layout_alignParentTop="true"
 	        android:layout_toRightOf="@+id/profile_manager_item_image" />
 
 	    <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:paddingLeft="16dp"
 	        android:paddingRight="16dp"
@@ -134,39 +130,8 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:text="HTTP"
 					style="@style/ProfileManagerListBadge"
 					android:id="@+id/record_details_text_ssid" android:layout_gravity="center_vertical" android:layout_marginLeft="10dp"/>
-			<TextView style="@style/ProfileManagerListBadge" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			          android:textAppearance="?android:attr/textAppearanceSmall" android:text="HTTP" android:id="@+id/textView2" android:layout_gravity="center_vertical"
-			          android:layout_marginLeft="10dp"/>
-			<TextView style="@style/ProfileManagerListBadge" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			          android:textAppearance="?android:attr/textAppearanceSmall" android:text="HTTP" android:id="@+id/record_conversation_info" android:layout_gravity="bottom"
-			          android:layout_marginLeft="10dp"/>
-			<TextView style="@style/ProfileManagerListBadge" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			          android:textAppearance="?android:attr/textAppearanceSmall" android:text="HTTP" android:id="@+id/textView3" android:layout_gravity="center_vertical"
-			          android:layout_marginLeft="10dp"/>
-			<TextView style="@style/ProfileManagerListBadge" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			          android:textAppearance="?android:attr/textAppearanceSmall" android:text="HTTP" android:id="@+id/record_conversation_type" android:layout_gravity="bottom"
-			          android:layout_marginLeft="10dp"/>
-			<TextView style="@style/ProfileManagerListBadge" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			          android:textAppearance="?android:attr/textAppearanceSmall" android:text="HTTP" android:id="@+id/record_details_text_bssid" android:layout_gravity="center_vertical"
-			          android:layout_marginLeft="10dp"/>
-			<TextView style="@style/ProfileManagerListBadge" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			          android:textAppearance="?android:attr/textAppearanceSmall" android:text="HTTP" android:id="@+id/textView5" android:layout_gravity="center_vertical"
-			          android:layout_marginLeft="10dp"/>
-			<TextView style="@style/ProfileManagerListBadge" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			          android:textAppearance="?android:attr/textAppearanceSmall" android:text="HTTP" android:id="@+id/textView9" android:layout_gravity="center_vertical"
-			          android:layout_marginLeft="10dp"/>
-			<TextView style="@style/ProfileManagerListBadge" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			          android:textAppearance="?android:attr/textAppearanceSmall" android:text="HTTP" android:id="@+id/record_details_text_remoteip" android:layout_gravity="bottom"
-			          android:layout_marginLeft="10dp"/>
-			<TextView style="@style/ProfileManagerListBadge" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			          android:textAppearance="?android:attr/textAppearanceSmall" android:text="HTTP" android:id="@+id/record_details_text_protocol" android:layout_gravity="center_vertical"
-			          android:layout_marginLeft="10dp"/>
-			<TextView style="@style/ProfileManagerListBadge" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			          android:textAppearance="?android:attr/textAppearanceSmall" android:text="HTTP" android:id="@+id/textView7" android:layout_gravity="center_vertical"
-			          android:layout_marginLeft="10dp"/>
 		</de.tudarmstadt.informatik.hostage.ui2.layouts.FlowLayout>
 
 	</RelativeLayout>

+ 0 - 4
res/layout/record_list_item.xml

@@ -13,7 +13,6 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:text="BSSID"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textColor="#000000" />
 
@@ -24,7 +23,6 @@
         android:layout_alignLeft="@+id/RecordTextFieldBSSID"
         android:layout_below="@+id/RecordTextFieldBSSID"
         android:layout_marginTop="24dp"
-        android:text="ESSID"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <TextView
@@ -35,7 +33,6 @@
         android:layout_alignBottom="@+id/RecordTextFieldSSID"
         android:layout_alignParentRight="true"
         android:layout_marginRight="5dp"
-        android:text="00:00:00"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <TextView
@@ -45,7 +42,6 @@
         android:layout_alignBaseline="@+id/RecordTextFieldBSSID"
         android:layout_alignBottom="@+id/RecordTextFieldBSSID"
         android:layout_alignRight="@+id/RecordTextFieldTimestamp"
-        android:text="Protocol"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="#000000" />
 

+ 0 - 1
res/layout/services_list_item.xml

@@ -25,7 +25,6 @@
                 android:layout_marginLeft="50dp"
                 android:layout_marginTop="5dp"
                 android:layout_weight="1"
-                android:text="SSH"
                 android:textStyle="bold"
                 android:textSize="16dp"/>
         <TextView

+ 0 - 1
res/layout/simple_popup_item.xml

@@ -17,7 +17,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="Title"
         android:id="@+id/title_text_view"
         android:textColor="#ffffff"
         android:textAlignment="textStart"

+ 0 - 1
res/layout/simple_popup_table.xml

@@ -11,7 +11,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="Title"
         android:gravity="top"
         android:id="@+id/title_text_view"
         android:textColor="@android:color/holo_blue_bright"

+ 0 - 4
res/layout/split_popup_item.xml

@@ -27,7 +27,6 @@
 		            android:layout_width="wrap_content"
 		            android:layout_height="wrap_content"
 		            android:textAppearance="?android:attr/textAppearanceMedium"
-		            android:text="Earliest"
 		            android:id="@+id/left_title_text_view"
 		            android:textColor="#ffffff"
 		            android:layout_alignParentStart="true"
@@ -37,7 +36,6 @@
 		            android:layout_width="wrap_content"
 		            android:layout_height="wrap_content"
 		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:text="Subtitle"
 		            android:id="@+id/left_subtitle_text_view"
 		            android:textColor="@color/light_grey"
 		            android:layout_alignParentStart="true"
@@ -70,7 +68,6 @@
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
 	            android:textAppearance="?android:attr/textAppearanceMedium"
-	            android:text="Title"
 	            android:id="@+id/right_title_text_view"
 	            android:textColor="#ffffff"
 	            android:layout_alignParentStart="true"
@@ -80,7 +77,6 @@
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
 	            android:textAppearance="?android:attr/textAppearanceSmall"
-	            android:text="Subtitle"
 	            android:id="@+id/right_subtitle_text_view"
 	            android:textColor="@color/light_grey"
 	            android:layout_alignParentStart="true"

+ 0 - 15
res/menu/main.xml

@@ -1,15 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/gui_action_settings"/>
-    
-    <item
-        android:id="@+id/action_about"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/gui_action_about"/>
-
-</menu>

+ 7 - 0
res/values-de/strings_gui.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="gui_choose_device">Gerät auswählen</string>
+    <string name="gui_nfc">NFC</string>
+    <string name="gui_bluetooth">Bluetooth</string>
+    <string name="gui_tracing">Tracing</string>
+</resources>

+ 2 - 0
res/values-de/strings_preferences.xml

@@ -30,5 +30,7 @@
     <string name="pref_location_time_default">60000</string>
     <string name="pref_location_retries">Retries</string>
     <string name="pref_location_retries_default">3</string>
+	<string name="pref_auto_synchronize_title">Autosynchronisation</string>
+	<string name="pref_auto_synchronize_summ">Autosynchronisation von Logdaten aktivieren</string>
 
 </resources>

+ 0 - 0
res/values/strings_broadcast.xml → res/values/broadcast.xml


+ 0 - 0
res/values/strings_connection_info.xml → res/values/connection_info.xml


+ 0 - 14
res/values/strings_about.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-	<string name="text_version">Version:</string>
-	<string name="description">HosTaGe is an open source low interaction honeypot, designed by a group of students at TU Darmstadt under the supervision of Shankar Karuppayah (CASED). The logs produced during usage can be uploaded to another project called \'TraCINg\'</string>
-	<string name="link_website">http://www.tk.informatik.tu-darmstadt.de/de/research/secure-smart-infrastructures/hostage</string>
-	<string name="link_github">https://github.com/hostage-org/hostage</string>
-	<string name="link_tracing">http://ssi.cased.de</string>
-	<string name="authors">Authors</string>
-	<string name="authors_m">Mihai Plasoianu</string>
-	<string name="authors_l">Lars Pandikow</string>
-	<string name="authors_w">Wulf Pfeiffer</string>
-	
-</resources>

+ 0 - 28
res/values/strings_gui.xml

@@ -1,35 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <string name="gui_action_about">About</string>
-    <string name="gui_action_settings">Settings</string>
-    <string name="gui_bssid">BSSID:</string>
-    <string name="gui_cancel">Cancel</string>
-    <string name="gui_capital_off">ON</string>
-    <string name="gui_capital_on">OFF</string>
-    <string name="gui_clear">Clear</string>
-    <string name="gui_connections">Recorded connections:</string>
-    <string name="gui_database">Database</string>
-    <string name="gui_delete">Delete</string>
-    <string name="gui_delete_dialog_title">Delete data sets by:</string>
-    <string name="gui_details">Connection info</string>
-    <string name="gui_dialog_clear_database">Clear all data?</string>
-    <string name="gui_dialog_clear_database_date">Delete all data before:</string>
-    <string name="gui_export_dialog_title">Choose Export Format</string>
-    <string name="gui_external_ip">External IP:</string>
-    <string name="gui_firstAttack">First Attack:</string>
-    <string name="gui_internal_ip">Internal IP:</string>
-    <string name="gui_lastAttack">Last Attack:</string>
-    <string name="gui_log_actions">Actions</string>
-    <string name="gui_paranoid">Paranoid Mode</string>
-    <string name="gui_playground">Playground</string>
-    <string name="gui_services">Services</string>
-    <string name="gui_ssid">SSID:</string>
-    <string name="gui_statistics">Statistics</string>
-    <string name="gui_status">Status</string>
     <string name="gui_choose_device">Choose Device</string>
     <string name="gui_nfc">NFC</string>
     <string name="gui_bluetooth">Bluetooth</string>
     <string name="gui_tracing">Tracing</string>
-    
 </resources>

+ 0 - 35
src/de/tudarmstadt/informatik/hostage/ui/AboutActivity.java

@@ -1,35 +0,0 @@
-package de.tudarmstadt.informatik.hostage.ui;
-
-import android.app.Activity;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Bundle;
-import android.widget.TextView;
-import de.tudarmstadt.informatik.hostage.R;
-
-/**
- * Shows a simple About View with application version, a small discription and
- * authors of the project.
- * 
- * @author Lars Pandikow
- * 
- */
-public class AboutActivity extends Activity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_about);
-		// Set Version Number
-		PackageInfo pInfo;
-		try {
-			pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
-			String version = pInfo.versionName;
-			TextView versionTextView = (TextView) findViewById(R.id.version);
-			versionTextView.setText(version);
-		} catch (NameNotFoundException e) {
-			e.printStackTrace();
-		}
-
-	}
-}

+ 0 - 66
src/de/tudarmstadt/informatik/hostage/ui/ListViewAdapter.java

@@ -1,66 +0,0 @@
-package de.tudarmstadt.informatik.hostage.ui;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-import de.tudarmstadt.informatik.hostage.R;
-
-/**
- * Custom ListViewAdapter to dynamically create a list of protocols.
- * 
- * @author Mihai Plasoianu
- */
-public class ListViewAdapter extends BaseAdapter {
-
-	private LayoutInflater inflater;
-	private ArrayList<HashMap<String, String>> data;
-
-	public ListViewAdapter(LayoutInflater inflater,
-			ArrayList<HashMap<String, String>> data) {
-		this.inflater = inflater;
-		this.data = data;
-	}
-
-	@Override
-	public int getCount() {
-		return data.size();
-	}
-
-	@Override
-	public Object getItem(int position) {
-		return data.get(position);
-	}
-
-	@Override
-	public long getItemId(int position) {
-		return position;
-	}
-
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent) {
-		View v = convertView;
-		if (v == null) {
-			v = inflater.inflate(R.layout.list_view_protocols_row, null);
-		}
-
-		ImageView light = (ImageView) v.findViewById(R.id.imageViewLight);
-		TextView protocol = (TextView) v.findViewById(R.id.textViewProtocol);
-		TextView connections = (TextView) v
-				.findViewById(R.id.textViewConnectionsValue);
-
-		HashMap<String, String> d = new HashMap<String, String>();
-		d = data.get(position);
-
-		light.setImageResource(Integer.valueOf(d.get("light")).intValue());
-		protocol.setText(d.get("protocol"));
-		connections.setText(d.get("connections"));
-
-		return v;
-	}
-}

+ 0 - 610
src/de/tudarmstadt/informatik/hostage/ui/MainActivity.java

@@ -1,610 +0,0 @@
-package de.tudarmstadt.informatik.hostage.ui;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import android.app.ActivityManager;
-import android.app.ActivityManager.RunningServiceInfo;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.content.LocalBroadcastManager;
-import android.view.GestureDetector;
-import android.view.GestureDetector.SimpleOnGestureListener;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnTouchListener;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.ToggleButton;
-import android.widget.ViewAnimator;
-import de.tudarmstadt.informatik.hostage.Hostage;
-import de.tudarmstadt.informatik.hostage.Hostage.LocalBinder;
-import de.tudarmstadt.informatik.hostage.R;
-import de.tudarmstadt.informatik.hostage.persistence.HostageDBOpenHelper;
-
-/**
- * MainActivity is the central activity for the GUI of the application.
- * MainActivity is launched when the application is first started. It shows the
- * user: <br>
- * - information about the network<br>
- * - light indicators for recorded attacks on each protocol<br>
- * - amount of attacks on each protocols<br>
- * The user can start and stop services.
- * 
- * @author Mihai Plasoianu
- * @author Lars Pandikow
- * @author Wulf Pfeiffer
- */
-public class MainActivity extends FragmentActivity {
-
-	/**
-	 * Integer representing a grey light.
-	 */
-	public static final int LIGHT_GREY = 0x01;
-	/**
-	 * Integer representing a green light.
-	 */
-	public static final int LIGHT_GREEN = 0x02;
-	/**
-	 * Integer representing a red light.
-	 */
-	public static final int LIGHT_RED = 0x03;
-	/**
-	 * Integer representing a yellow light.
-	 */
-	public static final int LIGHT_YELLOW = 0x04;
-
-	private SharedPreferences connectionInfo;
-
-	private Hostage mService;
-	private boolean serviceBound;
-
-	// variables for the swipe animation
-	private ViewAnimator viewAnimator;
-	private GestureDetector gestureDetector;
-	private Animation animFlipInLR;
-	private Animation animFlipOutLR;
-	private Animation animFlipInRL;
-	private Animation animFlipOutRL;
-
-	private ListView listView;
-	private ListViewAdapter adapter;
-
-	/**
-	 * Connection to bind the background service
-	 * 
-	 * @see Hostage
-	 */
-	private ServiceConnection mConnection = new ServiceConnection() {
-		/**
-		 * After the service is bound, check which has been clicked and start
-		 * it.
-		 * 
-		 * @see android.content.ServiceConnection#onServiceConnected(android.content.ComponentName)
-		 */
-		@Override
-		public void onServiceConnected(ComponentName name, IBinder service) {
-			mService = ((LocalBinder) service).getService();
-			serviceBound = true;
-			updateUI();
-		}
-
-		/**
-		 * After the service is unbound, delete reference.
-		 * 
-		 * @see android.content.ServiceConnection#onServiceDisconnected(android.content.ComponentName)
-		 */
-		@Override
-		public void onServiceDisconnected(ComponentName name) {
-			mService = null;
-			serviceBound = false;
-		}
-
-	};
-
-	/**
-	 * Receiver for custom broadcast.
-	 * 
-	 * @see #BROADCAST
-	 */
-	private BroadcastReceiver mReceiver = new BroadcastReceiver() {
-		@Override
-		public void onReceive(Context context, Intent intent) {
-			// Update user interface.
-			updateUI();
-			updateConnectionInfText();
-		}
-	};
-
-	SimpleOnGestureListener simpleOnGestureListener = new SimpleOnGestureListener() {
-		@Override
-		public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-			float sensitvity = 50;
-			if ((e1.getX() - e2.getX()) > sensitvity) {
-				swipeRightToLeft();
-			} else if ((e2.getX() - e1.getX()) > sensitvity) {
-				swipeLeftToRight();
-			}
-
-			return true;
-		}
-	};
-
-	/**
-	 * Called when User presses on/off button.
-	 * 
-	 * @param view
-	 */
-	public void buttonOnOffClick(View view) {
-		if (((ToggleButton) view).isChecked()) {
-			if (isParanoid()) {
-				String[] protocols = getResources().getStringArray(R.array.protocols);
-				for (String protocol : protocols) {
-					mService.startListener(protocol);
-				}
-			} else {
-				if (mService.isRunning("SMB")) {
-					mService.stopListener("SMB");
-				} else {
-					mService.startListener("SMB");
-				}
-			}
-		} else {
-			mService.stopListeners();
-			stopAndUnbind();
-		}
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.main, menu);
-		return true;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		// Handle item selection
-		switch (item.getItemId()) {
-		case R.id.action_settings:
-			startActivity(new Intent(this, SettingsActivity.class));
-			break;
-		case R.id.action_about:
-			startActivity(new Intent(this, AboutActivity.class));
-			break;
-		default:
-		}
-		return super.onOptionsItemSelected(item);
-	}
-
-	@Override
-	public boolean onTouchEvent(MotionEvent event) {
-		return gestureDetector.onTouchEvent(event);
-	}
-
-	/**
-	 * Starts the ViewLog activity, when the Button is pressed.
-	 * 
-	 * @see ViewLog
-	 * @param view
-	 *            View elements which triggers the method call.
-	 */
-	public void showLog(View view) {
-		// startActivity(new Intent(this, ViewLog.class));
-	}
-
-	public void startPlayGround(View view) {
-		startActivity(new Intent(this, PlayGroundActivity.class));
-	}
-
-	/**
-	 * Binds service to Activity
-	 * 
-	 * @see Hostage
-	 */
-	private void bindService() {
-		bindService(getServiceIntent(), mConnection, BIND_AUTO_CREATE);
-	}
-
-	/**
-	 * Returns an intent to start HoneyService.
-	 * 
-	 * @return An Intent to start HoneyService
-	 */
-	private Intent getServiceIntent() {
-		return new Intent(this, Hostage.class);
-	}
-
-	/**
-	 * Initializes the ListView. Creating its contents dynamic from protocol
-	 * res/values/protocols.xml
-	 */
-	private void initListView() {
-		ArrayList<HashMap<String, String>> data = new ArrayList<HashMap<String, String>>();
-		for (String protocol : getResources().getStringArray(R.array.protocols)) {
-			HashMap<String, String> d = new HashMap<String, String>();
-			d.put("light", String.valueOf(R.drawable.light_grey));
-			d.put("protocol", protocol);
-			d.put("connections", "-");
-			data.add(d);
-		}
-		listView = (ListView) findViewById(R.id.listViewProtocols);
-		adapter = new ListViewAdapter(getLayoutInflater(), data);
-		listView.setAdapter(adapter);
-		listView.setOnTouchListener(new OnTouchListener() {
-
-			@Override
-			public boolean onTouch(View v, MotionEvent event) {
-				return gestureDetector.onTouchEvent(event);
-			}
-
-		});
-		listView.setOnItemClickListener(new OnItemClickListener() {
-
-			@Override
-			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-				String protocolName = (String) ((HashMap<?, ?>) adapter.getItem(position)).get("protocol");
-				if (mService.isRunning(protocolName)) {
-					mService.stopListener(protocolName);
-				} else {
-					mService.startListener(protocolName);
-				}
-			}
-		});
-	}
-
-	/**
-	 * Initializes variables for screen animation
-	 */
-	private void initViewAnimator() {
-		viewAnimator = (ViewAnimator) findViewById(R.id.viewAnimator);
-		gestureDetector = new GestureDetector(this, simpleOnGestureListener);
-
-		animFlipInLR = AnimationUtils.loadAnimation(this, R.anim.in_left_to_right);
-		animFlipOutLR = AnimationUtils.loadAnimation(this, R.anim.out_left_to_right);
-		animFlipInRL = AnimationUtils.loadAnimation(this, R.anim.in_right_to_left);
-		animFlipOutRL = AnimationUtils.loadAnimation(this, R.anim.out_right_to_left);
-	}
-
-	/**
-	 * Checks if user selected paranoid mode.
-	 * 
-	 * @return True when paranoid mode is selected, else returns false.
-	 */
-	private boolean isParanoid() {
-		return ((CheckBox) findViewById(R.id.checkBoxParanoid)).isChecked();
-	}
-
-	/**
-	 * Checks if a {@link Hostage} instance is running.
-	 * 
-	 * @return True if {@link Hostage} is running, else false.
-	 */
-	private boolean isServiceBound() {
-		return serviceBound;
-	}
-
-	/**
-	 * Checks if a {@link Hostage} instance is running.
-	 * 
-	 * @return True if {@link Hostage} is running, else false.
-	 */
-	private boolean isServiceRunning() {
-		ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
-		for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
-			if (service.service.getClassName().equals(Hostage.class.getName())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Register broadcast receiver for custom broadcast.
-	 * 
-	 * @see #BROADCAST
-	 */
-	private void registerReceiver() {
-		LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, new IntentFilter(getString(R.string.broadcast)));
-	}
-
-	/**
-	 * If mobile phone is connected to a wireless network starts the background
-	 * service ands binds itself to it. Else notifies the user that service
-	 * could not be started.
-	 */
-	private void startAndBind() {
-		startService(getServiceIntent());
-		bindService();
-	}
-
-	/**
-	 * Stops service and unbinds it.
-	 * 
-	 * @see Hostage
-	 */
-	private void stopAndUnbind() {
-		unbindService();
-		stopService(getServiceIntent());
-	}
-
-	/**
-	 * Called when a swipe to the Right is registered.
-	 */
-	private void swipeLeftToRight() {
-		if (viewAnimator.getDisplayedChild() == 1) {
-			viewAnimator.setInAnimation(animFlipInLR);
-			viewAnimator.setOutAnimation(animFlipOutLR);
-			viewAnimator.setDisplayedChild(0);
-		}
-	}
-
-	/**
-	 * Called when a swipe to the Left is registered.
-	 */
-	private void swipeRightToLeft() {
-		if (viewAnimator.getDisplayedChild() == 0) {
-			viewAnimator.setInAnimation(animFlipInRL);
-			viewAnimator.setOutAnimation(animFlipOutRL);
-			viewAnimator.setDisplayedChild(1);
-		}
-	}
-
-	/**
-	 * Unbinds service.
-	 * 
-	 * @see Hostage
-	 */
-	private void unbindService() {
-		unbindService(mConnection);
-	}
-
-	/**
-	 * Unregisters broadcast receiver for custom broadcast.
-	 * 
-	 * @see #BROADCAST
-	 */
-	private void unregisterReceiver() {
-		LocalBroadcastManager.getInstance(this).unregisterReceiver(mReceiver);
-	}
-
-	/**
-	 * Gets Information about connection state and updates the GUI.
-	 */
-	private void updateConnectionInfText() {
-		TextView ssidView = (TextView) findViewById(R.id.textViewSSIDValue);
-		TextView bssidView = (TextView) findViewById(R.id.textViewBSSIDValue);
-		TextView internalIPView = (TextView) findViewById(R.id.textViewInternalIPValue);
-		TextView externalIPView = (TextView) findViewById(R.id.textViewExternalIPValue);
-
-		// externalIPView.setText("Loading...");
-
-		// Get connection information
-		String ssid = connectionInfo.getString(getString(R.string.connection_info_ssid), null);
-		String bssid = connectionInfo.getString(getString(R.string.connection_info_bssid), null);
-		String internalIP = connectionInfo.getString(getString(R.string.connection_info_internal_ip), null);
-		String externalIP = connectionInfo.getString(getString(R.string.connection_info_external_ip), null);
-
-		// Set text fields
-		if (ssid != null)
-			ssidView.setText(ssid);
-		else
-			ssidView.setText("-");
-
-		if (bssid != null)
-			bssidView.setText(bssid);
-		else
-			bssidView.setText("-");
-
-		if (internalIP != null)
-			internalIPView.setText(internalIP);
-		else
-			internalIPView.setText("-");
-
-		if (externalIP != null)
-			externalIPView.setText(externalIP);
-		else
-			externalIPView.setText("-");
-	}
-
-	/**
-	 * Sets the connections count for a given protocol.
-	 * 
-	 * @param connections
-	 *            New value for recorded connections.
-	 * @param protocolName
-	 *            Name of the protocol which should be updated.
-	 */
-	private void updateProtocolConnections(int connections, String protocolName) {
-		for (int i = 0; i < adapter.getCount(); ++i) {
-			HashMap<String, String> d = (HashMap<String, String>) adapter.getItem(i);
-			if (d.get("protocol").equals(protocolName)) {
-				d.put("connections", String.valueOf(connections));
-			}
-		}
-		adapter.notifyDataSetChanged();
-	}
-
-	/**
-	 * Sets the light indicator for a given protocol.
-	 * 
-	 * @param light
-	 *            Integer code to set the light color.
-	 * @param protocolName
-	 *            Name of the protocol which should be updated.
-	 */
-	private void updateProtocolLight(int light, String protocolName) {
-		for (int i = 0; i < adapter.getCount(); ++i) {
-			HashMap<String, String> d = (HashMap<String, String>) adapter.getItem(i);
-			if (d.get("protocol").equals(protocolName)) {
-				switch (light) {
-				case LIGHT_GREY:
-					d.put("light", String.valueOf(R.drawable.light_grey));
-					d.put("connections", "-");
-					break;
-				case LIGHT_GREEN:
-					d.put("light", String.valueOf(R.drawable.light_green));
-					break;
-				case LIGHT_RED:
-					d.put("light", String.valueOf(R.drawable.light_red));
-					break;
-				case LIGHT_YELLOW:
-					d.put("light", String.valueOf(R.drawable.light_yellow));
-					break;
-				}
-			}
-		}
-		adapter.notifyDataSetChanged();
-	}
-
-	/**
-	 * Sets the big light indicator.
-	 * 
-	 * @param light
-	 *            Integer code to set the light color.
-	 * @see #LIGHT_GREY
-	 * @see #LIGHT_GREEN
-	 * @see #LIGHT_RED
-	 * @see #LIGHT_YELLOW
-	 */
-	private void updateStatusLight(int light) {
-		switch (light) {
-		case LIGHT_GREY:
-			((ImageView) findViewById(R.id.imageViewLight)).setImageResource(R.drawable.light_grey_large);
-			break;
-		case LIGHT_GREEN:
-			((ImageView) findViewById(R.id.imageViewLight)).setImageResource(R.drawable.light_green_large);
-			break;
-		case LIGHT_RED:
-			((ImageView) findViewById(R.id.imageViewLight)).setImageResource(R.drawable.light_red_large);
-			break;
-		case LIGHT_YELLOW:
-			((ImageView) findViewById(R.id.imageViewLight)).setImageResource(R.drawable.light_yellow_large);
-			break;
-		}
-	}
-
-	/* ############# Help functions for animation ################## */
-
-	/**
-	 * Updates Information shown by the GUI.
-	 */
-	private void updateUI() {
-		boolean activeListeners = false;
-		boolean activeHandlers = false;
-		boolean yellowLight = false;
-
-		// Check for all protocols if listeners are active and attacks have been
-		// recorded
-		// Update protocol lights and connection information.
-		for (String protocol : getResources().getStringArray(R.array.protocols)) {
-			if (isServiceBound()) {
-				// Check if protocol is active
-				if (mService.isRunning(protocol)) {
-					activeListeners = true;
-					int handlerCount = mService.getNumberOfActiveConnections(protocol);
-					// Check if attacks have been recorded in this session.
-					if (handlerCount > 0) {
-						activeHandlers = true;
-						updateProtocolLight(LIGHT_RED, protocol);
-						updateProtocolConnections(handlerCount, protocol);
-					} else {
-						// Check if the bssid of the wireless network has
-						// already
-						// been recorded as infected.
-						HostageDBOpenHelper dbh = new HostageDBOpenHelper(this);
-						if (dbh.bssidSeen(protocol, connectionInfo.getString(getString(R.string.connection_info_bssid), null))) {
-							updateProtocolLight(LIGHT_YELLOW, protocol);
-							yellowLight = true;
-						} else {
-							updateProtocolLight(LIGHT_GREEN, protocol);
-						}
-						updateProtocolConnections(0, protocol);
-					}
-				} else {
-					updateProtocolLight(LIGHT_GREY, protocol);
-				}
-			} else {
-				updateProtocolLight(LIGHT_GREY, protocol);
-			}
-		}
-
-		// Update the big attack indicator.
-		if (activeListeners) {
-			if (activeHandlers) {
-				updateStatusLight(LIGHT_RED);
-			} else {
-				if (yellowLight) {
-					updateStatusLight(LIGHT_YELLOW);
-				} else {
-					updateStatusLight(LIGHT_GREEN);
-				}
-			}
-			((ToggleButton) findViewById(R.id.toggleButtonOnOff)).setChecked(true);
-			findViewById(R.id.checkBoxParanoid).setEnabled(false);
-		} else {
-			updateStatusLight(LIGHT_GREY);
-			((ToggleButton) findViewById(R.id.toggleButtonOnOff)).setChecked(false);
-			findViewById(R.id.checkBoxParanoid).setEnabled(true);
-		}
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_main);
-		connectionInfo = getSharedPreferences(getString(R.string.connection_info), Context.MODE_PRIVATE);
-
-		// Create dynamic view elements
-		initViewAnimator();
-		initListView();
-		// Initialize Class variables
-		startAndBind();
-	}
-
-	@Override
-	protected void onDestroy() {
-		// Unbind running service
-		if (!mService.hasRunningListeners()) {
-			stopAndUnbind();
-		}
-		super.onDestroy();
-	}
-
-	@Override
-	protected void onStart() {
-		super.onStart();
-		// Register Broadcast Receiver
-		registerReceiver();
-		// Bind service if running, else check for connection change and delete
-		// sessionData
-		if (isServiceRunning()) {
-			bindService(getServiceIntent(), mConnection, BIND_AUTO_CREATE);
-		}
-		// Update UI
-		updateConnectionInfText();
-	}
-
-	@Override
-	protected void onStop() {
-		// Unregister Broadcast Receiver
-		unregisterReceiver();
-		super.onStop();
-	}
-
-}

+ 0 - 107
src/de/tudarmstadt/informatik/hostage/ui/PlayGroundActivity.java

@@ -1,107 +0,0 @@
-package de.tudarmstadt.informatik.hostage.ui;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Random;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import android.view.Menu;
-import android.view.View;
-import android.widget.TextView;
-import de.tudarmstadt.informatik.hostage.R;
-import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
-import de.tudarmstadt.informatik.hostage.logging.NetworkRecord;
-import de.tudarmstadt.informatik.hostage.logging.SyncInfoRecord;
-import de.tudarmstadt.informatik.hostage.persistence.HostageDBContract;
-import de.tudarmstadt.informatik.hostage.persistence.HostageDBOpenHelper;
-import de.tudarmstadt.informatik.hostage.sync.bluetooth.BluetoothSyncActivity;
-import de.tudarmstadt.informatik.hostage.sync.nfc.NFCSync;
-import de.tudarmstadt.informatik.hostage.sync.tracing.TracingSyncActivity;
-
-public class PlayGroundActivity extends Activity {
-
-
-	public void createNetworkData(View view) {
-		Random rnd = new Random();
-		ArrayList<NetworkRecord> fakeNetInfo = new ArrayList<NetworkRecord>();
-		for (int i = 0; i < 25; i++) {
-			NetworkRecord record = new NetworkRecord();
-			record.setBssid(createRandomBSSID());
-			record.setSsid(new BigInteger(130, rnd).toString(32));
-			record.setLatitude(rnd.nextDouble() * 360);
-			record.setLongitude(rnd.nextDouble() * 360);
-			record.setAccuracy(rnd.nextFloat());
-			record.setTimestampLocation(System.currentTimeMillis());
-			fakeNetInfo.add(record);
-		}
-
-		setNetworkInfoText();
-		new HostageDBOpenHelper(this).updateNetworkInformation(fakeNetInfo);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.main, menu);
-		return true;
-	}
-
-	public void startNFC(View view) {
-		startActivity(new Intent(this, TracingSyncActivity.class));
-	}
-
-	public void syncData(View view) {
-		startActivity(new Intent(this, BluetoothSyncActivity.class));
-	}
-
-	private String createRandomBSSID() {
-		Random rnd = new Random();
-		char[] symbols = new char[16];
-		for (int idx = 0; idx < 10; ++idx)
-			symbols[idx] = (char) ('0' + idx);
-		for (int idx = 10; idx < 16; ++idx)
-			symbols[idx] = (char) ('a' + idx - 10);
-
-		char[] buf = new char[17];
-		for (int i = 0; i < 18; i += 3) {
-			buf[i] = symbols[rnd.nextInt(symbols.length)];
-			buf[i + 1] = symbols[rnd.nextInt(symbols.length)];
-			if (i < 15) {
-				buf[i + 2] = ':';
-			}
-		}
-		return new String(buf);
-	}
-
-	private void setNetworkInfoText() {
-		HostageDBOpenHelper dbh = new HostageDBOpenHelper(this);
-		TextView text_view = (TextView) findViewById(R.id.textView1);
-		String text = "";
-		ArrayList<SyncInfoRecord> syncInfo = dbh.getSyncInfo();
-		HashMap<String, Long> syncDevices = dbh.getSyncDevices();
-
-		for (SyncInfoRecord info: syncInfo) {
-			text = text + info.getBSSID() + "\n"
-					+ info.getDeviceID() + "\n" +
-					+ info.getNumber_of_attacks() + "\n"
-					+ info.getNumber_of_portscans() + "\n\n";
-		}
-		
-		for(String device: syncDevices.keySet()){
-			text = text + device + "\n"
-					+ syncDevices.get(device) + "\n\n";
-		}
-		text_view.setText(text);
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_playground);
-		setNetworkInfoText();
-	}
-}

+ 0 - 194
src/de/tudarmstadt/informatik/hostage/ui/SettingsActivity.java

@@ -1,194 +0,0 @@
-package de.tudarmstadt.informatik.hostage.ui;
-
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.os.Bundle;
-import android.preference.EditTextPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceManager;
-import android.widget.Toast;
-import de.tudarmstadt.informatik.hostage.R;
-
-/**
- * SettingsActivity creates the settings defined in /res/xml/preferences.xml.
- * 
- * @author Lars Pandikow.
- */
-public class SettingsActivity extends PreferenceActivity implements
-		OnSharedPreferenceChangeListener {
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		addPreferencesFromResource(R.xml.preferences);
-		// Set the value of the preference as the summary for the preference
-		Preference pref = findPreference("pref_external_location");
-		EditTextPreference etp = (EditTextPreference) pref;
-		pref.setSummary(etp.getText());
-
-		// Set the value of the preference as the summary for the preference
-		pref = findPreference("pref_upload_server");
-		etp = (EditTextPreference) pref;
-		pref.setSummary(etp.getText());
-
-		SharedPreferences defaultPref = PreferenceManager
-				.getDefaultSharedPreferences(this);
-		// Set the value of the preference as the summary for the preference
-		pref = findPreference("pref_max_connections");
-		etp = (EditTextPreference) pref;
-		defaultPref
-				.edit()
-				.putInt("max_connections",
-						Integer.valueOf(etp.getText()).intValue()).commit();
-		pref.setSummary(etp.getText());
-
-		// Set the value of the preference as the summary for the preference
-		pref = findPreference("pref_timeout");
-		etp = (EditTextPreference) pref;
-		defaultPref.edit()
-				.putInt("timeout", Integer.valueOf(etp.getText()).intValue())
-				.commit();
-		pref.setSummary(etp.getText());
-
-		// Set the value of the preference as the summary for the preference
-		pref = findPreference("pref_sleeptime");
-		etp = (EditTextPreference) pref;
-		defaultPref.edit()
-				.putInt("sleeptime", Integer.valueOf(etp.getText()).intValue())
-				.commit();
-		pref.setSummary(etp.getText());
-
-		// Set the value of the preference as the summary for the preference
-		pref = findPreference("pref_location_time");
-		etp = (EditTextPreference) pref;
-		defaultPref
-				.edit()
-				.putInt("location_time",
-						Integer.valueOf(etp.getText()).intValue()).commit();
-		pref.setSummary(etp.getText());
-
-		// Set the value of the preference as the summary for the preference
-		pref = findPreference("pref_location_retries");
-		etp = (EditTextPreference) pref;
-		defaultPref
-				.edit()
-				.putInt("location_retries",
-						Integer.valueOf(etp.getText()).intValue()).commit();
-		pref.setSummary(etp.getText());
-	}
-
-	@Override
-	public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
-			String key) {
-		// Check which preference has been changed
-		if (key.equals("pref_external_location")) {
-			Preference pref = findPreference(key);
-			EditTextPreference etp = (EditTextPreference) pref;
-			String path = etp.getText();
-			// Check if the Path is valid
-			if (!path.startsWith("/"))
-				path = new String("/").concat(path);
-			if (!path.endsWith("/"))
-				path = path.concat(new String("/"));
-			if (!path.matches("/(([a-zA-Z_0-9])+/)*")) {
-				Toast.makeText(this,
-						"Path not valid. Must only contain a-zA-Z_0-9",
-						Toast.LENGTH_SHORT).show();
-				path = "/";
-				sharedPreferences.edit().putString(key, path).commit();
-			}
-			pref.setSummary(path);
-		} else if (key.equals("pref_upload_server")) {
-			Preference pref = findPreference(key);
-			EditTextPreference etp = (EditTextPreference) pref;
-			pref.setSummary(etp.getText());
-		} else if (key.equals("pref_max_connections")) {
-			Preference pref = findPreference(key);
-			EditTextPreference etp = (EditTextPreference) pref;
-			String value = etp.getText();
-			if (!value.matches("([0-9])+")) {
-				Toast.makeText(getApplicationContext(),
-						"Enter a valid number.", Toast.LENGTH_SHORT).show();
-				value = getResources().getString(
-						R.string.pref_max_connections_default);
-			}
-			sharedPreferences
-					.edit()
-					.putInt("max_connections",
-							Integer.valueOf(value).intValue()).commit();
-			pref.setSummary(value);
-		} else if (key.equals("pref_timeout")) {
-			Preference pref = findPreference(key);
-			EditTextPreference etp = (EditTextPreference) pref;
-			String value = etp.getText();
-			if (!value.matches("([0-9])+")) {
-				Toast.makeText(getApplicationContext(),
-						"Enter a valid number.", Toast.LENGTH_SHORT).show();
-				value = getResources().getString(R.string.pref_timeout_default);
-			}
-			sharedPreferences.edit()
-					.putInt("timeout", Integer.valueOf(value).intValue())
-					.commit();
-			pref.setSummary(value);
-		} else if (key.equals("pref_sleeptime")) {
-			Preference pref = findPreference(key);
-			EditTextPreference etp = (EditTextPreference) pref;
-			String value = etp.getText();
-			if (!value.matches("([0-9])+")) {
-				Toast.makeText(getApplicationContext(),
-						"Enter a valid number.", Toast.LENGTH_SHORT).show();
-				value = getResources().getString(
-						R.string.pref_sleeptime_default);
-			}
-			sharedPreferences.edit()
-					.putInt("sleeptime", Integer.valueOf(value).intValue())
-					.commit();
-			pref.setSummary(value);
-		} else if (key.equals("pref_location_time")) {
-			Preference pref = findPreference(key);
-			EditTextPreference etp = (EditTextPreference) pref;
-			String value = etp.getText();
-			if (!value.matches("([0-9])+")) {
-				Toast.makeText(getApplicationContext(),
-						"Enter a valid number.", Toast.LENGTH_SHORT).show();
-				value = getResources().getString(
-						R.string.pref_location_time_default);
-			}
-			sharedPreferences.edit()
-					.putInt("location_time", Integer.valueOf(value).intValue())
-					.commit();
-			pref.setSummary(value);
-		} else if (key.equals("pref_location_retries")) {
-			Preference pref = findPreference(key);
-			EditTextPreference etp = (EditTextPreference) pref;
-			String value = etp.getText();
-			if (!value.matches("([0-9])+")) {
-				Toast.makeText(getApplicationContext(),
-						"Enter a valid number.", Toast.LENGTH_SHORT).show();
-				value = getResources().getString(
-						R.string.pref_location_retries_default);
-			}
-			sharedPreferences
-					.edit()
-					.putInt("location_retries",
-							Integer.valueOf(value).intValue()).commit();
-			pref.setSummary(value);
-		}
-
-	}
-
-	@Override
-	protected void onPause() {
-		super.onPause();
-		getPreferenceScreen().getSharedPreferences()
-				.unregisterOnSharedPreferenceChangeListener(this);
-	}
-
-	@Override
-	protected void onResume() {
-		// register a listener to catch preference changes
-		super.onResume();
-		getPreferenceScreen().getSharedPreferences()
-				.registerOnSharedPreferenceChangeListener(this);
-	}
-}

+ 0 - 37
src/de/tudarmstadt/informatik/hostage/ui/ViewLogTable.java

@@ -1,37 +0,0 @@
-package de.tudarmstadt.informatik.hostage.ui;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import de.tudarmstadt.informatik.hostage.logging.Record;
-import de.tudarmstadt.informatik.hostage.persistence.HostageDBOpenHelper;
-
-/**
- * Creates a simple log view. Shows the Information for every attack. The format
- * ist defined in {@link Record#toString(int)}.
- * 
- * @author Lars Pandikow
- * 
- */
-public class ViewLogTable extends Activity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		HostageDBOpenHelper dbh = new HostageDBOpenHelper(getBaseContext());
-		StringBuffer log = new StringBuffer();
-		// Create a log entry for every attack in the Database
-		for (Record record : dbh.getAllRecords()) {
-			log.append(record.toString());
-		}
-
-		ScrollView scroll = new ScrollView(this);
-		TextView text = new TextView(getApplicationContext());
-		text.setText(log);
-		text.setTextAppearance(this, android.R.style.TextAppearance_Medium);
-		scroll.addView(text);
-		setContentView(scroll);
-	}
-
-}

+ 4 - 1
src/de/tudarmstadt/informatik/hostage/ui2/adapter/ServicesListAdapter.java

@@ -2,6 +2,8 @@ package de.tudarmstadt.informatik.hostage.ui2.adapter;
 
 import java.util.List;
 
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -285,7 +287,8 @@ public class ServicesListAdapter extends ArrayAdapter<ServicesListItem> {
      * @param holder   ViewHolder which represents the item in the View
      * @param drawable int which represents the ID of the drawable we want to display, e.g. on a present attack it should be R.drawable.services_circle_red
      */
-    private void setBackground(ViewHolder holder, int drawable) {
+	@SuppressLint("NewApi")
+	private void setBackground(ViewHolder holder, int drawable) {
         if (sdk < Build.VERSION_CODES.JELLY_BEAN) {
             holder.circle.setBackgroundDrawable(MainActivity.getInstance().getResources().getDrawable(drawable));
         } else {

+ 1 - 1
src/de/tudarmstadt/informatik/hostage/ui2/fragment/RecordDetailFragment.java

@@ -92,7 +92,7 @@ public class RecordDetailFragment extends UpNavigatibleFragment {
 
 	public int getLayoutId() {
 		// return R.layout.fragment_record_detail;
-		return R.layout.fragment_record_overview;
+		return R.layout.fragment_record_detail;
 	}
 
 	public void onCreate(Bundle savedInstanceState) {

+ 1 - 1
src/de/tudarmstadt/informatik/hostage/ui2/fragment/opengl/AnimatedMesh.java

@@ -217,7 +217,7 @@ public class AnimatedMesh {
 		// header
 		int magicNum = data.getInt();
 		int version = data.getInt();
-		assert(magicNum == ('A' << 24 | 'M' << 16 | 'S' << 8 | 'H') && version == 1);
+		//assert(magicNum == ('A' << 24 | 'M' << 16 | 'S' << 8 | 'H') && version == 1);
 		
 		vertexSize = 48;
 		vertexOffset = data.getInt();