Changed app name. Fixed threatmap and random crashes. Changed API key.

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.tudarmstadt.informatik.hostage"
     xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="3"
-    android:versionName="1.1" >
+    android:versionCode="7"
+    android:versionName="1.3" >
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -53,7 +53,7 @@
             android:value="@integer/google_play_services_lib_version" />
         <meta-data
             android:name="com.google.android.maps.v2.API_KEY"
-            android:value="@string/google_maps_api_key" />
+            android:value="AIzaSyDs3xp1-2KQojns5h7mWHHdQxAL-5AZ-q4" />
 
         <activity
             android:name=".ui.activity.MainActivity"

build-types/release/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.tudarmstadt.informatik.hostage"
-    android:versionCode="3"
-    android:versionName="1.1" >
+    android:versionCode="7"
+    android:versionName="1.3" >
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -52,7 +52,7 @@
             android:value="@integer/google_play_services_lib_version" />
         <meta-data
             android:name="com.google.android.maps.v2.API_KEY"
-            android:value="@string/google_maps_api_key_release" />
+            android:value="AIzaSyDs3xp1-2KQojns5h7mWHHdQxAL-5AZ-q4" />
 
         <activity
             android:name=".ui.activity.MainActivity"

build.gradle

@@ -35,14 +35,13 @@ dependencies {
 android {
     compileSdkVersion 19
     buildToolsVersion "19.1.0"
-
     defaultConfig {
-        versionCode 3
-        versionName "1.1"
+        versionCode 7
+        versionName "1.3"
         minSdkVersion 14
         targetSdkVersion 19
+        signingConfig signingConfigs.config
     }
-
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -66,38 +65,39 @@ android {
         debug.setRoot('build-types/debug')
         release.setRoot('build-types/release')
     }
-
     // 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: ")
+                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:")
             }
         }
     }
-
     buildTypes {
         debug {
             debuggable true
             jniDebuggable true
-            resValue "string", "google_maps_api_key", "AIzaSyCqh4bb4aMzvDcpDfiqHyXoAWFTQ6iNxe8"
+            resValue "string", "google_maps_api_key", "AIzaSyDs3xp1-2KQojns5h7mWHHdQxAL-5AZ-q4"
         }
-
         if (doSigningForRelease) {
             release {
                 debuggable false
                 jniDebuggable false
                 signingConfig signingConfigs.release
-                resValue "string", "google_maps_api_key", "AIzaSyCqh4bb4aMzvDcpDfiqHyXoAWFTQ6iNxe8"
+                resValue "string", "google_maps_api_key", "AIzaSyDs3xp1-2KQojns5h7mWHHdQxAL-5AZ-q4"
             }
         }
+        release {
+            signingConfig signingConfigs.config
+        }
     }
-
     lintOptions {
         abortOnError false
     }
+    productFlavors {
+    }
 }

res/values-de/strings.xml

@@ -273,4 +273,8 @@
             zu HosTaGe
         </a>
     </string>
+    <string name="multistage_service">Mehrstufige Service</string>
+    <string name="multistage_summary">Aktivieren Mehrstufige Angriff Detection Service</string>
+    <string name="portbinder_tutorial">Videoanleitung</string>
+    <string name="service">Dienste</string>
 </resources>

res/values/api_keys.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="google_maps_api_key_debug">AIzaSyCqh4bb4aMzvDcpDfiqHyXoAWFTQ6iNxe8</string>
-	<string name="google_maps_api_key_release">AIzaSyCxYbHYCoA0Mc_uZ_RwxqfJFZC1HBzzTR8</string>
-	<string name="virustotal_api_key">111c226204f5de7228563bbca91c5860e4965fbe936307dffa8f2f2d575ff292</string>
+	<string name="google_maps_api_key_debug" translatable="false">AIzaSyDs3xp1-2KQojns5h7mWHHdQxAL-5AZ-q4</string>
+	<string name="google_maps_api_key_release" translatable="false">AIzaSyDs3xp1-2KQojns5h7mWHHdQxAL-5AZ-q4</string>
+	<string name="virustotal_api_key" translatable="false">111c226204f5de7228563bbca91c5860e4965fbe936307dffa8f2f2d575ff292</string>
 </resources>

res/values/broadcast.xml

@@ -2,10 +2,10 @@
 <resources>
 
     
-    <string name="broadcast">de.tudarmstadt.informatik.hostage.BROADCAST</string>    
-    <string name="broadcast_connectivity">de.tudarmstadt.informatik.hostage.BROADCAST.CONNECTIVITY_CHANGE</string>
-    <string name="broadcast_started">de.tudarmstadt.informatik.hostage.BROADCAST.STARTED</string>
-    <string name="broadcast_stopped">de.tudarmstadt.informatik.hostage.BROADCAST.STOPPED</string>
+    <string name="broadcast" translatable="false">de.tudarmstadt.informatik.hostage.BROADCAST</string>
+    <string name="broadcast_connectivity" translatable="false">de.tudarmstadt.informatik.hostage.BROADCAST.CONNECTIVITY_CHANGE</string>
+    <string name="broadcast_started" translatable="false">de.tudarmstadt.informatik.hostage.BROADCAST.STARTED</string>
+    <string name="broadcast_stopped" translatable="false">de.tudarmstadt.informatik.hostage.BROADCAST.STOPPED</string>
 
     
 </resources>

res/values/connection_info.xml

@@ -3,12 +3,12 @@
 
     
    
-    <string name="connection_info">de.tudarmstadt.informatik.hostage.CONNECTION_INFO</string>
-    <string name="connection_info_bssid">de.tudarmstadt.informatik.hostage.CONNECTION_INFO.BSSID</string>
-    <string name="connection_info_ssid">de.tudarmstadt.informatik.hostage.CONNECTION_INFO.SSID</string>
-    <string name="connection_info_internal_ip">de.tudarmstadt.informatik.hostage.CONNECTION_INFO.INTERNAL_IP</string>
-	<string name="connection_info_subnet_mask">de.tudarmstadt.informatik.hostage.CONNECTION_INFO.SUBNET_MASK</string>
- 	<string name="connection_info_external_ip">de.tudarmstadt.informatik.hostage.CONNECTION_INFO.EXTERNAL_IP</string>  
+    <string name="connection_info" translatable="false">de.tudarmstadt.informatik.hostage.CONNECTION_INFO</string>
+    <string name="connection_info_bssid" translatable="false">de.tudarmstadt.informatik.hostage.CONNECTION_INFO.BSSID</string>
+    <string name="connection_info_ssid" translatable="false">de.tudarmstadt.informatik.hostage.CONNECTION_INFO.SSID</string>
+    <string name="connection_info_internal_ip" translatable="false">de.tudarmstadt.informatik.hostage.CONNECTION_INFO.INTERNAL_IP</string>
+	<string name="connection_info_subnet_mask" translatable="false">de.tudarmstadt.informatik.hostage.CONNECTION_INFO.SUBNET_MASK</string>
+ 	<string name="connection_info_external_ip" translatable="false">de.tudarmstadt.informatik.hostage.CONNECTION_INFO.EXTERNAL_IP</string>
 
     
 </resources>

res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">HosTaGe ICS</string>
+    <string name="app_name">HosTaGe</string>
     <string name="action_settings">Settings</string>
     <string name="action_about">About</string>
     <string name="capital_on">OFF</string>
@@ -30,9 +30,9 @@
     <string name="not_rooted">Your device does not have root access. To unlock full functionality of HosTaGe, a rooted device is required.</string>
     <string name="help">Help</string>
     <string name="confirm">Confirm</string>
-	<string name="ok">OK</string>
+	<string name="ok" translatable="false">OK</string>
     <string name="how">How?</string>
-    <string name="portbinder">Portbinder</string>
+    <string name="portbinder" translatable="false">Portbinder</string>
     <string name="portbinder_tutorial">Video Tutorial</string>
     <string name="portbinder_website">Visit Website</string>
     <string name="helpPortbinder">Please follow the instructions in our website to install \'Portbinder\'.\n\nAlternatively, you can use the automated installer by pressing the \'Just Help Me!\' button.</string>
@@ -126,15 +126,15 @@
     <string name="yes">Yes</string>
     <string name="no">No</string>
 
-    <string name="no_data_notification">No Attacks are recorded. Please check your filter option.</string>
-    <string name="no_data_notification_no_filter">No Attacks are recorded.</string>
+    <string name="no_data_notification">No Attacks have been recorded. Please check your filter option.</string>
+    <string name="no_data_notification_no_filter">No Attacks have been recorded.</string>
 
     <string name="TODAY">Today</string>
     <string name="YESTERDAY">Yesterday</string>
 
     <string name="hostage_with_url"><a href="http://www.tk.informatik.tu-darmstadt.de/de/research/secure-smart-infrastructures/hostage">HosTaGe ICS</a></string>
     <string name="hostage_email"><a href="mailto:hostage@tk.informatik.tu-darmstadt.de?Subject=Inquiry">Tell us what do you think about HosTaGe</a></string>
-    <string name="hostage_email_only">hostage@tk.informatik.tu-darmstadt.de</string>
+    <string name="hostage_email_only" translatable="false">hostage@tk.informatik.tu-darmstadt.de</string>
     <string name="ui_dev_by">Developers team:</string>
     <string name="core_dev_by">Core developed by</string>
     <string name="advanced_settings">Advanced Settings</string>
@@ -246,9 +246,9 @@
 	<string name="profile_linux_hard_desc">This profile will imitate a linux machine which has just SSH activated</string>
     <string name="profile_voip_desc">This profile imitates a VOIP Server by monitoring the SIP service</string>
     <string name="profile_random_desc">This profile monitors services randomly</string>
-    <string name="profile_nuclearPower_desc">This profile simulates the Siemens SIMATIC S7 200 PLC working in a Nuclear Power Plant Environment</string>
-    <string name="profile_waterPlant_desc">This profile simulates the PLC infrastructure of a Water Distribution and Treatment Plant </string>
-    <string name="profile_modbusMater_desc">This profile simulates a MODBUS Master system that controls PLCs in a ICS SCADA environment</string>
+    <string name="profile_nuclearPower_desc" translatable="false">This profile simulates the Siemens SIMATIC S7 200 PLC working in a Nuclear Power Plant Environment</string>
+    <string name="profile_waterPlant_desc" translatable="false">This profile simulates the PLC infrastructure of a Water Distribution and Treatment Plant </string>
+    <string name="profile_modbusMater_desc" translatable="false">This profile simulates a MODBUS Master system that controls PLCs in a ICS SCADA environment</string>
     <string name="profile_paranoid_desc">This profile monitors all available services</string>
     <string name="profile_help_swipe">Swipe from the left or right on an item to expose all available actions for an item</string>
     <string name="profile_monitor_ghost">Monitor GHOST</string>
@@ -261,9 +261,9 @@
     <string name="profile_warning">Please note, that this profile can\'t be edited. If you make any changes to this profile, a new profile will be created.</string>
     <string name="rec_choose_export_format">Choose export format</string>
     <string name="rec_sync_rec">Synchronize records</string>
-    <string name="bro_signature">Bro Signature </string>
-    <string name="bro_message">This generates a Bro signature policy for this attack</string>
-    <string name="generate">Generate</string>
+    <string name="bro_signature" translatable="false">Bro Signature </string>
+    <string name="bro_message" translatable="false">This generates a Bro signature policy for this attack</string>
+    <string name="generate" translatable="false">Generate</string>
     <string name="rec_via_bt">Via Bluetooth</string>
     <string name="rec_via_nfc">Via NFC</string>
     <string name="rec_via_online">Via Online Database</string>
@@ -282,5 +282,12 @@
 
 
 <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="hello_blank_fragment" translatable="false">Hello blank fragment</string>
+    <string name="pref_max_connections_default">5</string>
+    <string name="pref_sleeptime">Stream sleep time</string>
+    <string name="pref_sleeptime_default">500</string>
+    <string name="pref_sleeptime_summary">Time in ms for stream sleeptime</string>
+    <string name="pref_timeout_default">30</string>
+    <string name="portscan">&#160;Portscan</string>
+    <string name="portscans">&#160;Portscans</string>
 </resources>

res/values/strings_preferences.xml

@@ -22,7 +22,7 @@
 	<string name="pref_timeout">Socket Timeout</string>
 	<string name="pref_timeout_summary">After this many seconds close socket when no communication occurred</string>
 	<integer name="pref_timeout_default">30</integer>
-	<string name="pref_portscan_timeout">Portscan Timeout</string>
+	<string name="pref_portscan_timeout" translatable="false">Portscan Timeout</string>
 	<string name="pref_portscan_timeout_summary">Should match the maximum duration of a portscan in seconds</string>
 	<integer name="pref_portscan_timeout_default">60</integer>
 	<string name="pref_location_settings">Location Settings</string>